Commit 5976d975 authored by Brett Cannon's avatar Brett Cannon

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.
parent 313a120a
......@@ -859,8 +859,14 @@ class saved_test_environment:
sys.path_hooks[:] = saved_hooks[2]
def get___import__(self):
if isinstance(__builtins__, dict):
return __builtins__['__import__']
else:
return __builtins__.__import__
def restore___import__(self, import_):
if isinstance(__builtins__, dict):
__builtins__['__import__'] = import_
else:
__builtins__.__import__ = import_
def get_warnings_filters(self):
......
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