diff options
| author | Barry Warsaw <barry@python.org> | 2018-02-03 04:21:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 04:21:14 (GMT) |
| commit | a71397fb6603d0fe673acd7765c74699cd28fe7b (patch) | |
| tree | b861446d1911d5861a98df799f209dc12893fa45 /Lib/test/test_importlib/test_api.py | |
| parent | 7e4cf8e95d2971ae0d5fb417152183070184293f (diff) | |
| download | cpython-a71397fb6603d0fe673acd7765c74699cd28fe7b.zip cpython-a71397fb6603d0fe673acd7765c74699cd28fe7b.tar.gz cpython-a71397fb6603d0fe673acd7765c74699cd28fe7b.tar.bz2 | |
[3.6] bpo-32303 - Consistency fixes for namespace loaders (GH-5481) (#5504)
* Make sure ``__spec__.loader`` matches ``__loader__`` for namespace packages.
* Make sure ``__spec__.origin` matches ``__file__`` for namespace packages.
https://bugs.python.org/issue32303
https://bugs.python.org/issue32305.
(cherry picked from commit bbbcf8693b876daae4469765aa62f8924f39a7d2)
Co-authored-by: Barry Warsaw <barry@python.org>
Diffstat (limited to 'Lib/test/test_importlib/test_api.py')
| -rw-r--r-- | Lib/test/test_importlib/test_api.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py index b0a94aa..446ed6c 100644 --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -307,6 +307,7 @@ class ReloadTests: expected = {'__name__': name, '__package__': name, '__doc__': None, + '__file__': None, } os.mkdir(name) with open(bad_path, 'w') as init_file: @@ -318,8 +319,9 @@ class ReloadTests: 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) + self.assertIsNotNone(spec.loader) + self.assertIsNotNone(loader) + self.assertEqual(spec.loader, loader) self.assertEqual(set(path), set([os.path.dirname(bad_path)])) with self.assertRaises(AttributeError): |