mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-22 21:32:31 +00:00
Move importlib functions to within C (#408)
This offers a 10% speedup in Python startup time. It also makes debugging using cosmopolitan tooling easier.
This commit is contained in:
parent
10b97ca630
commit
7e9fb0a9f1
6 changed files with 690 additions and 124 deletions
79
third_party/python/Lib/importlib/_bootstrap.py
vendored
79
third_party/python/Lib/importlib/_bootstrap.py
vendored
|
@ -300,22 +300,14 @@ class _installed_safely:
|
|||
# This must be done before putting the module in sys.modules
|
||||
# (otherwise an optimization shortcut in import.c becomes
|
||||
# wrong)
|
||||
self._spec._initializing = True
|
||||
sys.modules[self._spec.name] = self._module
|
||||
|
||||
def __exit__(self, *args):
|
||||
try:
|
||||
spec = self._spec
|
||||
if any(arg is not None for arg in args):
|
||||
try:
|
||||
del sys.modules[spec.name]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
_verbose_message('import {!r} # {!r}', spec.name, spec.loader)
|
||||
finally:
|
||||
self._spec._initializing = False
|
||||
|
||||
spec = self._spec
|
||||
if args and any(arg is not None for arg in args):
|
||||
sys.modules.pop(spec.name, None)
|
||||
else:
|
||||
_verbose_message('import {!r} # {!r}', spec.name, spec.loader)
|
||||
|
||||
class ModuleSpec:
|
||||
"""The specification for a module, used for loading.
|
||||
|
@ -531,24 +523,23 @@ def _module_repr_from_spec(spec):
|
|||
def _exec(spec, module):
|
||||
"""Execute the spec's specified module in an existing module's namespace."""
|
||||
name = spec.name
|
||||
with _ModuleLockManager(name):
|
||||
if sys.modules.get(name) is not module:
|
||||
msg = 'module {!r} not in sys.modules'.format(name)
|
||||
raise ImportError(msg, name=name)
|
||||
if spec.loader is None:
|
||||
if spec.submodule_search_locations is None:
|
||||
raise ImportError('missing loader', name=spec.name)
|
||||
# namespace package
|
||||
_init_module_attrs(spec, module, override=True)
|
||||
return module
|
||||
if sys.modules.get(name) is not module:
|
||||
msg = 'module {!r} not in sys.modules'.format(name)
|
||||
raise ImportError(msg, name=name)
|
||||
if spec.loader is None:
|
||||
if spec.submodule_search_locations is None:
|
||||
raise ImportError('missing loader', name=spec.name)
|
||||
# namespace package
|
||||
_init_module_attrs(spec, module, override=True)
|
||||
if not hasattr(spec.loader, 'exec_module'):
|
||||
# (issue19713) Once BuiltinImporter and ExtensionFileLoader
|
||||
# have exec_module() implemented, we can add a deprecation
|
||||
# warning here.
|
||||
spec.loader.load_module(name)
|
||||
else:
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
_init_module_attrs(spec, module, override=True)
|
||||
if not hasattr(spec.loader, 'exec_module'):
|
||||
# (issue19713) Once BuiltinImporter and ExtensionFileLoader
|
||||
# have exec_module() implemented, we can add a deprecation
|
||||
# warning here.
|
||||
spec.loader.load_module(name)
|
||||
else:
|
||||
spec.loader.exec_module(module)
|
||||
return sys.modules[name]
|
||||
|
||||
|
||||
|
@ -613,8 +604,7 @@ def _load(spec):
|
|||
clobbered.
|
||||
|
||||
"""
|
||||
with _ModuleLockManager(spec.name):
|
||||
return _load_unlocked(spec)
|
||||
return _load_unlocked(spec)
|
||||
|
||||
|
||||
# Loaders #####################################################################
|
||||
|
@ -816,15 +806,14 @@ def _find_spec(name, path, target=None):
|
|||
# sys.modules provides one.
|
||||
is_reload = name in sys.modules
|
||||
for finder in meta_path:
|
||||
with _ImportLockContext():
|
||||
try:
|
||||
find_spec = finder.find_spec
|
||||
except AttributeError:
|
||||
spec = _find_spec_legacy(finder, name, path)
|
||||
if spec is None:
|
||||
continue
|
||||
else:
|
||||
spec = find_spec(name, path, target)
|
||||
try:
|
||||
find_spec = finder.find_spec
|
||||
except AttributeError:
|
||||
spec = _find_spec_legacy(finder, name, path)
|
||||
if spec is None:
|
||||
continue
|
||||
else:
|
||||
spec = find_spec(name, path, target)
|
||||
if spec is not None:
|
||||
# The parent import may have already imported this module.
|
||||
if not is_reload and name in sys.modules:
|
||||
|
@ -911,17 +900,15 @@ _NEEDS_LOADING = object()
|
|||
|
||||
def _find_and_load(name, import_):
|
||||
"""Find and load the module."""
|
||||
with _ModuleLockManager(name):
|
||||
module = sys.modules.get(name, _NEEDS_LOADING)
|
||||
if module is _NEEDS_LOADING:
|
||||
return _find_and_load_unlocked(name, import_)
|
||||
module = sys.modules.get(name, _NEEDS_LOADING)
|
||||
if module is _NEEDS_LOADING:
|
||||
return _find_and_load_unlocked(name, import_)
|
||||
|
||||
if module is None:
|
||||
message = ('import of {} halted; '
|
||||
'None in sys.modules'.format(name))
|
||||
raise ModuleNotFoundError(message, name=name)
|
||||
|
||||
_lock_unlock_module(name)
|
||||
return module
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue