Merge with 3.2.
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 @@
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 @@
# 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('.', '_')