From 4507190a1eb9d386c5088b3aab0833b908b90629 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 14 Jun 2010 22:22:54 +0000
Subject: [PATCH] Switch the __import__ state check from using __builtins__ to
builtins to be nicer to other VMs.
Thanks to Philip Jenvey for the pointer.
---
Lib/test/regrtest.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 8b46f6edfe..b5a91efb92 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -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[:]
--
2.40.0