mirror of
https://github.com/python/cpython.git
synced 2025-10-17 12:18:23 +00:00
When dealing with __import__ for detecting a global state change made by a
test, make sure to check if __builtins__ is a dict or not. Discovered when running importlib.test.regrtest.
This commit is contained in:
parent
313a120ab6
commit
5976d975f8
1 changed files with 8 additions and 2 deletions
|
@ -859,9 +859,15 @@ class saved_test_environment:
|
|||
sys.path_hooks[:] = saved_hooks[2]
|
||||
|
||||
def get___import__(self):
|
||||
return __builtins__.__import__
|
||||
if isinstance(__builtins__, dict):
|
||||
return __builtins__['__import__']
|
||||
else:
|
||||
return __builtins__.__import__
|
||||
def restore___import__(self, import_):
|
||||
__builtins__.__import__ = import_
|
||||
if isinstance(__builtins__, dict):
|
||||
__builtins__['__import__'] = import_
|
||||
else:
|
||||
__builtins__.__import__ = import_
|
||||
|
||||
def get_warnings_filters(self):
|
||||
return id(warnings.filters), warnings.filters, warnings.filters[:]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue