diff options
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 7 | ||||
| -rw-r--r-- | Lib/importlib/test/frozen/test_loader.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index fc2a744..99fb236 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -138,10 +138,9 @@ class FrozenImporter: if cls.find_module(fullname) is None: raise ImportError("{0} is not a frozen module".format(fullname)) module = imp.init_frozen(fullname) - if hasattr(module, '__path__'): - module.__package__ = module.__name__ - elif '.' in module.__name__: - module.__package__ = module.__name__.rsplit('.', 1)[0] + module.__package__ = module.__name__ + if not hasattr(module, '__path__'): + module.__package__ = module.__package__.rpartition('.')[0] return module diff --git a/Lib/importlib/test/frozen/test_loader.py b/Lib/importlib/test/frozen/test_loader.py index c6f4463..9032b0b 100644 --- a/Lib/importlib/test/frozen/test_loader.py +++ b/Lib/importlib/test/frozen/test_loader.py @@ -9,7 +9,7 @@ class LoaderTests(abc.LoaderTests): with util.uncache('__hello__'): module = machinery.FrozenImporter.load_module('__hello__') check = {'__name__': '__hello__', '__file__': '<frozen>', - '__package__': None} + '__package__': ''} for attr, value in check.items(): self.assertEqual(getattr(module, attr), value) |