From: Brett Cannon <brett@python.org>
Date: Sun, 16 Jun 2013 19:20:48 +0000 (-0400)
Subject: Check that warnings.showwarning() is not changed.
X-Git-Tag: v3.4.0a1~472
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d26eba186655be245af90c4a7c2aec6a1e14fc6;p=thirdparty%2FPython%2Fcpython.git

Check that warnings.showwarning() is not changed.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7602b2be0d89..b3ba33f8d607 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1062,7 +1062,7 @@ class saved_test_environment:
                  'sys.warnoptions', 'threading._dangling',
                  'multiprocessing.process._dangling',
                  'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
-                 'support.TESTFN', 'locale',
+                 'support.TESTFN', 'locale', 'warnings.showwarning',
                 )
 
     def get_sys_argv(self):
@@ -1244,6 +1244,11 @@ class saved_test_environment:
         for lc, setting in saved:
             locale.setlocale(lc, setting)
 
+    def get_warnings_showwarning(self):
+        return warnings.showwarning
+    def restore_warnings_showwarning(self, fxn):
+        warnings.showwarning = fxn
+
     def resource_info(self):
         for name in self.resources:
             method_suffix = name.replace('.', '_')