Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.

Browse source
This commit is contained in:
Eric Snow 2014-05-13 12:15:42 -06:00
parent 7664eb0297
commit 2f46a0e8be
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/test/test_importlib/test_api.py
View file

@ -241,13 +241,13 @@ def test_reload_location_changed(self):
'__file__': path, '__file__': path,
'__cached__': cached, '__cached__': cached,
'__doc__': None, '__doc__': None,
'__builtins__': __builtins__,
} }
support.create_empty_file(path) support.create_empty_file(path)
module = self.init.import_module(name) module = self.init.import_module(name)
ns = vars(module) ns = vars(module).copy()
loader = ns.pop('__loader__') loader = ns.pop('__loader__')
spec = ns.pop('__spec__') spec = ns.pop('__spec__')
ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name) self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader) self.assertEqual(spec.loader, loader)
self.assertEqual(loader.path, path) self.assertEqual(loader.path, path)
@ -263,14 +263,14 @@ def test_reload_location_changed(self):
'__cached__': cached, '__cached__': cached,
'__path__': [os.path.dirname(init_path)], '__path__': [os.path.dirname(init_path)],
'__doc__': None, '__doc__': None,
'__builtins__': __builtins__,
} }
os.mkdir(name) os.mkdir(name)
os.rename(path, init_path) os.rename(path, init_path)
reloaded = self.init.reload(module) reloaded = self.init.reload(module)
ns = vars(reloaded) ns = vars(reloaded).copy()
loader = ns.pop('__loader__') loader = ns.pop('__loader__')
spec = ns.pop('__spec__') spec = ns.pop('__spec__')
ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name) self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader) self.assertEqual(spec.loader, loader)
self.assertIs(reloaded, module) self.assertIs(reloaded, module)
@ -295,10 +295,11 @@ def test_reload_namespace_changed(self):
with open(bad_path, 'w') as init_file: with open(bad_path, 'w') as init_file:
init_file.write('eggs = None') init_file.write('eggs = None')
module = self.init.import_module(name) module = self.init.import_module(name)
ns = vars(module) ns = vars(module).copy()
loader = ns.pop('__loader__') loader = ns.pop('__loader__')
path = ns.pop('__path__') path = ns.pop('__path__')
spec = ns.pop('__spec__') spec = ns.pop('__spec__')
ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name) self.assertEqual(spec.name, name)
self.assertIs(spec.loader, None) self.assertIs(spec.loader, None)
self.assertIsNot(loader, None) self.assertIsNot(loader, None)
@ -319,14 +320,14 @@ def test_reload_namespace_changed(self):
'__cached__': cached, '__cached__': cached,
'__path__': [os.path.dirname(init_path)], '__path__': [os.path.dirname(init_path)],
'__doc__': None, '__doc__': None,
'__builtins__': __builtins__,
'eggs': None, 'eggs': None,
} }
os.rename(bad_path, init_path) os.rename(bad_path, init_path)
reloaded = self.init.reload(module) reloaded = self.init.reload(module)
ns = vars(reloaded) ns = vars(reloaded).copy()
loader = ns.pop('__loader__') loader = ns.pop('__loader__')
spec = ns.pop('__spec__') spec = ns.pop('__spec__')
ns.pop('__builtins__', None) # An implementation detail.
self.assertEqual(spec.name, name) self.assertEqual(spec.name, name)
self.assertEqual(spec.loader, loader) self.assertEqual(spec.loader, loader)
self.assertIs(reloaded, module) self.assertIs(reloaded, module)

2
Misc/NEWS
View file

@ -187,6 +187,8 @@ Library
- Issue #20884: Don't assume that __file__ is defined on importlib.__init__. - Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
- Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.
- Issue #20879: Delay the initialization of encoding and decoding tables for - Issue #20879: Delay the initialization of encoding and decoding tables for
base32, ascii85 and base85 codecs in the base64 module, and delay the base32, ascii85 and base85 codecs in the base64 module, and delay the
initialization of the unquote_to_bytes() table of the urllib.parse module, to initialization of the unquote_to_bytes() table of the urllib.parse module, to