Merge with 3.2.

2 files changed, 9 insertions, 2 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 6267702..a7a7de3 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -827,7 +827,8 @@ class saved_test_environment:
     resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr',
                  'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
                  'warnings.filters', 'asyncore.socket_map',
-                 'logging._handlers', 'logging._handlerList', 'sys.gettrace')
+                 'logging._handlers', 'logging._handlerList', 'sys.gettrace',
+                 'sys.warnoptions')
 
     def get_sys_argv(self):
         return id(sys.argv), sys.argv, sys.argv[:]
@@ -914,6 +915,12 @@ class saved_test_environment:
         # Can't easily revert the logging state
         pass
 
+    def get_sys_warnoptions(self):
+        return id(sys.warnoptions), sys.warnoptions, sys.warnoptions[:]
+    def restore_sys_warnoptions(self, saved_options):
+        sys.warnoptions = saved_options[1]
+        sys.warnoptions[:] = saved_options[2]
+
     def resource_info(self):
         for name in self.resources:
             method_suffix = name.replace('.', '_')
diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index a50a245..d5d0f5a 100644
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -189,7 +189,7 @@ class TestCommandLineArgs(unittest.TestCase):
         class FakeTP(unittest.TestProgram):
             def parseArgs(self, *args, **kw): pass
             def runTests(self, *args, **kw): pass
-        warnoptions = sys.warnoptions
+        warnoptions = sys.warnoptions[:]
         try:
             sys.warnoptions[:] = []
             # no warn options, no arg -> default