diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2014-05-13 12:15:42 -0600 |
|---|---|---|
| committer | Eric Snow <ericsnowcurrently@gmail.com> | 2014-05-13 12:15:42 -0600 |
| commit | 2f46a0e8bef2e0a29e032ef805e9a95924af00a7 (patch) | |
| tree | f17696803c4683d8d6d6593881f10117ed5d558a | |
| parent | 7664eb02973cad889e96c2aec7226dc890983d45 (diff) | |
| download | cpython-git-2f46a0e8bef2e0a29e032ef805e9a95924af00a7.tar.gz | |
Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.
| -rw-r--r-- | Lib/test/test_importlib/test_api.py | 15 | ||||
| -rw-r--r-- | 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 index 744001b4c0..2a2d42bbfe 100644 --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -241,13 +241,13 @@ class ReloadTests: '__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 @@ class ReloadTests: '__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 @@ class ReloadTests: 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 @@ class ReloadTests: '__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) @@ -187,6 +187,8 @@ Library - 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 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 |