Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Switch the __import__ state check from using __builtins__ to builtins to be 

nicer to other VMs.

Thanks to Philip Jenvey for the pointer.
This commit is contained in:
Brett Cannon 2010-06-14 22:22:54 +00:00
parent 97958cf3f8
commit 4507190a1e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/regrtest.py
View File

@ -152,6 +152,7 @@ example, to run all the tests except for the gui tests, give the
option '-uall,-gui'.
"""
import builtins
import getopt
import json
import os
@ -859,15 +860,9 @@ 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__
return builtins.__import__
def restore___import__(self, import_):
if isinstance(__builtins__, dict):
__builtins__['__import__'] = import_
else:
__builtins__.__import__ = import_
builtins.__import__ = import_
def get_warnings_filters(self):
return id(warnings.filters), warnings.filters, warnings.filters[:]