Commit 9180d527 authored by Victor Stinner's avatar Victor Stinner

Issue #28688: Remove warnings.filters check from regrtest

Reloading the warnings module duplicates filters in warnings.filters. Fixing
the issue is tricky. It was decided to simply remove the check from Python 3.5,
since the bug only impacts Python unit tests, not real applications.

The check is kept in Python 3.6 and newer.
parent 88fc38b2
...@@ -1052,7 +1052,7 @@ class saved_test_environment: ...@@ -1052,7 +1052,7 @@ class saved_test_environment:
resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr', resources = ('sys.argv', 'cwd', 'sys.stdin', 'sys.stdout', 'sys.stderr',
'os.environ', 'sys.path', 'sys.path_hooks', '__import__', 'os.environ', 'sys.path', 'sys.path_hooks', '__import__',
'warnings.filters', 'asyncore.socket_map', 'asyncore.socket_map',
'logging._handlers', 'logging._handlerList', 'sys.gettrace', 'logging._handlers', 'logging._handlerList', 'sys.gettrace',
'sys.warnoptions', 'sys.warnoptions',
# multiprocessing.process._cleanup() may release ref # multiprocessing.process._cleanup() may release ref
...@@ -1118,12 +1118,6 @@ class saved_test_environment: ...@@ -1118,12 +1118,6 @@ class saved_test_environment:
def restore___import__(self, import_): def restore___import__(self, import_):
builtins.__import__ = import_ builtins.__import__ = import_
def get_warnings_filters(self):
return id(warnings.filters), warnings.filters, warnings.filters[:]
def restore_warnings_filters(self, saved_filters):
warnings.filters = saved_filters[1]
warnings.filters[:] = saved_filters[2]
def get_asyncore_socket_map(self): def get_asyncore_socket_map(self):
asyncore = sys.modules.get('asyncore') asyncore = sys.modules.get('asyncore')
# XXX Making a copy keeps objects alive until __exit__ gets called. # XXX Making a copy keeps objects alive until __exit__ gets called.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment