mirror of
https://github.com/python/cpython.git
synced 2024-11-21 12:59:38 +01:00
79cf20e48d
Currently frozen modules do not have __file__ set. In their spec, origin is set to "frozen" and they are marked as not having a location. (Similarly, for frozen packages __path__ is set to an empty list.) However, for frozen stdlib modules we are able to extrapolate __file__ as long as we can determine the stdlib directory at runtime. (We now do so since gh-28586.) Having __file__ set is helpful for a number of reasons. Likewise, having a non-empty __path__ means we can import submodules of a frozen package from the filesystem (e.g. we could partially freeze the encodings module). This change sets __file__ (and adds to __path__) for frozen stdlib modules. It uses sys._stdlibdir (from gh-28586) and the frozen module alias information (from gh-28655). All that work is done in FrozenImporter (in Lib/importlib/_bootstrap.py). Also, if a frozen module is imported before importlib is bootstrapped (during interpreter initialization) then we fix up that module and its spec during the importlib bootstrapping step (i.e. imporlib._bootstrap._setup()) to match what gets set by FrozenImporter, including setting the file info (if the stdlib dir is known). To facilitate this, modules imported using PyImport_ImportFrozenModule() have __origname__ set using the frozen module alias info. __origname__ is popped off during importlib bootstrap. (To be clear, even with this change the new code to set __file__ during fixups in imporlib._bootstrap._setup() doesn't actually get triggered yet. This is because sys._stdlibdir hasn't been set yet in interpreter initialization at the point importlib is bootstrapped. However, we do fix up such modules at that point to otherwise match the result of importing through FrozenImporter, just not the __file__ and __path__ parts. Doing so will require changes in the order in which things happen during interpreter initialization. That can be addressed separately. Once it is, the file-related fixup code from this PR will kick in.) Here are things this change does not do: * set __file__ for non-stdlib modules (no way of knowing the parent dir) * set __file__ if the stdlib dir is not known (nor assume the expense of finding it) * relatedly, set __file__ if the stdlib is in a zip file * verify that the filename set to __file__ actually exists (too expensive) * update __path__ for frozen packages that alias a non-package (since there is no package dir) Other things this change skips, but we may do later: * set __file__ on modules imported using PyImport_ImportFrozenModule() * set co_filename when we unmarshal the frozen code object while importing the module (e.g. in FrozenImporter.exec_module()) -- this would allow tracebacks to show source lines * implement FrozenImporter.get_filename() and FrozenImporter.get_source() https://bugs.python.org/issue21736
57 lines
2.2 KiB
Python
57 lines
2.2 KiB
Python
"""Basic test of the frozen module (source is in Python/frozen.c)."""
|
|
|
|
# The Python/frozen.c source code contains a marshalled Python module
|
|
# and therefore depends on the marshal format as well as the bytecode
|
|
# format. If those formats have been changed then frozen.c needs to be
|
|
# updated.
|
|
#
|
|
# The test_importlib also tests this module but because those tests
|
|
# are much more complicated, it might be unclear why they are failing.
|
|
# Invalid marshalled data in frozen.c could case the interpreter to
|
|
# crash when __hello__ is imported.
|
|
|
|
import importlib.machinery
|
|
import sys
|
|
import unittest
|
|
from test.support import captured_stdout, import_helper
|
|
|
|
|
|
class TestFrozen(unittest.TestCase):
|
|
def test_frozen(self):
|
|
name = '__hello__'
|
|
if name in sys.modules:
|
|
del sys.modules[name]
|
|
with import_helper.frozen_modules():
|
|
import __hello__
|
|
with captured_stdout() as out:
|
|
__hello__.main()
|
|
self.assertEqual(out.getvalue(), 'Hello world!\n')
|
|
|
|
def test_frozen_submodule_in_unfrozen_package(self):
|
|
with import_helper.CleanImport('__phello__', '__phello__.spam'):
|
|
with import_helper.frozen_modules(enabled=False):
|
|
import __phello__
|
|
with import_helper.frozen_modules(enabled=True):
|
|
import __phello__.spam as spam
|
|
self.assertIs(spam, __phello__.spam)
|
|
self.assertIsNot(__phello__.__spec__.loader,
|
|
importlib.machinery.FrozenImporter)
|
|
self.assertIs(spam.__spec__.loader,
|
|
importlib.machinery.FrozenImporter)
|
|
|
|
def test_unfrozen_submodule_in_frozen_package(self):
|
|
with import_helper.CleanImport('__phello__', '__phello__.spam'):
|
|
with import_helper.frozen_modules(enabled=True):
|
|
import __phello__
|
|
with import_helper.frozen_modules(enabled=False):
|
|
import __phello__.spam as spam
|
|
self.assertIs(spam, __phello__.spam)
|
|
self.assertIs(__phello__.__spec__.loader,
|
|
importlib.machinery.FrozenImporter)
|
|
self.assertIsNot(spam.__spec__.loader,
|
|
importlib.machinery.FrozenImporter)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|