Merge pull request #112.

lib/tzinfo/ruby_core_support.rb

@@ -154,23 +154,16 @@ def self.open_file(file_name, mode, opts, &block)
 
 
     # Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
-    # 3.0. Add a refinement to either silence the warning, or supply the method
+    # 3.2. Add a refinement to either silence the warning, or supply the method
     # if needed.
-    old_verbose = $VERBOSE
-    $VERBOSE = false
-    begin
-      o = Object.new
-      if [:taint, :untaint, :tainted?].none? {|m| o.respond_to?(m) } || !o.taint.tainted?
-        module UntaintExt
-          refine Object do
-            def untaint
-              self
-            end
+    if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
+      module UntaintExt
+        refine Object do
+          def untaint
+            self
           end
         end
       end
-    ensure
-      $VERBOSE = old_verbose
     end
   end
 end

test/test_utils.rb

@@ -169,7 +169,7 @@ def assert_nothing_raised(msg = nil)
 
 
 # Object#taint is a deprecated no-op in Ruby 2.7 and outputs a warning. It will
-# be removed in 3.0. Silence the warning or supply a replacement.
+# be removed in 3.2. Silence the warning or supply a replacement.
 if TZInfo::RubyCoreSupport.const_defined?(:UntaintExt)
   module TaintExt
     refine Object do