[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4 (for #21499).
eric.snow
python-checkins at python.org
Tue May 13 20:19:49 CEST 2014
http://hg.python.org/cpython/rev/bdf94b2c0639
changeset: 90690:bdf94b2c0639
parent: 90688:0bb92c9fdb35
parent: 90689:16d26391ec36
user: Eric Snow <ericsnowcurrently at gmail.com>
date: Tue May 13 12:18:07 2014 -0600
summary:
Merge from 3.4 (for #21499).
files:
Lib/test/test_importlib/test_api.py | 15 ++++++++-------
Misc/NEWS | 2 ++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -241,13 +241,13 @@
'__file__': path,
'__cached__': cached,
'__doc__': None,
- '__builtins__': __builtins__,
}
support.create_empty_file(path)
module = self.init.import_module(name)
- ns = vars(module)
+ ns = vars(module).copy()
loader = ns.pop('__loader__')
spec = ns.pop('__spec__')
+ ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader)
self.assertEqual(loader.path, path)
@@ -263,14 +263,14 @@
'__cached__': cached,
'__path__': [os.path.dirname(init_path)],
'__doc__': None,
- '__builtins__': __builtins__,
}
os.mkdir(name)
os.rename(path, init_path)
reloaded = self.init.reload(module)
- ns = vars(reloaded)
+ ns = vars(reloaded).copy()
loader = ns.pop('__loader__')
spec = ns.pop('__spec__')
+ ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader)
self.assertIs(reloaded, module)
@@ -295,10 +295,11 @@
with open(bad_path, 'w') as init_file:
init_file.write('eggs = None')
module = self.init.import_module(name)
- ns = vars(module)
+ ns = vars(module).copy()
loader = ns.pop('__loader__')
path = ns.pop('__path__')
spec = ns.pop('__spec__')
+ ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name)
self.assertIs(spec.loader, None)
self.assertIsNot(loader, None)
@@ -319,14 +320,14 @@
'__cached__': cached,
'__path__': [os.path.dirname(init_path)],
'__doc__': None,
- '__builtins__': __builtins__,
'eggs': None,
}
os.rename(bad_path, init_path)
reloaded = self.init.reload(module)
- ns = vars(reloaded)
+ ns = vars(reloaded).copy()
loader = ns.pop('__loader__')
spec = ns.pop('__spec__')
+ ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader)
self.assertIs(reloaded, module)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -272,6 +272,8 @@
- Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
+- Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.
+
- Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
- Issue #19165: The formatter module now raises DeprecationWarning instead of
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list