Remove _reset_warning_registry (#38485)

dreiss · facebook-github-bot · commit 1f87f15ba3cd · 2020-05-14T15:03:30.000-07:00
Summary: Pull Request resolved: #38485 Python 2 has reached end-of-life and is no longer supported by PyTorch. This class does nothing in Python 3. Test Plan: CI Reviewed By: ailzhang Differential Revision: D21575260 Pulled By: dreiss fbshipit-source-id: 184696c9fa501e8d2517950b47cdbc90b2ae8053
diff --git a/torch/testing/_internal/common_utils.py b/torch/testing/_internal/common_utils.py
@@ -1110,7 +1110,7 @@ def assertNotWarn(self, callable, msg=''):
         r"""
         Test if :attr:`callable` does not raise a warning.
         """
-        with self._reset_warning_registry(), warnings.catch_warnings(record=True) as ws:
+        with warnings.catch_warnings(record=True) as ws:
             warnings.simplefilter("always")  # allow any warning to be raised
             callable()
             self.assertTrue(len(ws) == 0, msg)
@@ -1122,7 +1122,7 @@ def maybeWarnsRegex(self, category, regex=''):
         This filters expected warnings from the test log and fails the test if
         any unexpected warnings are caught.
         """
-        with self._reset_warning_registry(), warnings.catch_warnings(record=True) as ws:
+        with warnings.catch_warnings(record=True) as ws:
             warnings.simplefilter("always")  # allow any warning to be raised
             # Ignore expected warnings
             warnings.filterwarnings("ignore", message=regex, category=category)
@@ -1137,46 +1137,6 @@ def maybeWarnsRegex(self, category, regex=''):
                         msg += '\n'
                     self.fail(msg)
 
-    @contextmanager
-    def _reset_warning_registry(self):
-        r"""
-        warnings.catch_warnings() in Python 2 misses already registered
-        warnings. We need to manually clear the existing warning registries to
-        ensure catching warnings in a scope.
-        """
-        # Python 3 has no problem.
-        if sys.version_info >= (3,):
-            yield
-            return
-
-        # Backup and clear all existing warning registries.
-        backup = {}
-        for name, mod in list(sys.modules.items()):
-            try:
-                reg = mod.__warningregistry__
-            except AttributeError:
-                continue
-            else:
-                backup[name] = reg.copy()
-                reg.clear()
-
-        yield
-
-        # Restore backed up warning registries.
-        for name, reg_orig in backup.items():
-            try:
-                mod = sys.modules[name]
-            except KeyError:
-                continue
-
-            try:
-                reg = mod.__warningregistry__
-            except AttributeError:
-                mod.__warningregistry__ = reg_orig
-            else:
-                reg.clear()
-                reg.update(reg_orig)
-
     def assertExpected(self, s, subname=None):
         r"""
         Test that a string matches the recorded contents of a file
