mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Trivial cleanups following bpo-31370 (#3649)

Browse source 
* Trivial cleanups following bpo-31370

* Also cleanup the "importlib._bootstrap_external" module
This commit is contained in:
Antoine Pitrou 2017-09-18 23:50:44 +02:00 • committed by GitHub
parent b43c4caf81
commit 88c60c9668
16 changed files with 171 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/importlib/_bootstrap.py
View file

@ -1121,25 +1121,13 @@ def _setup(sys_module, _imp_module):
# Directly load built-in modules needed during bootstrap.
self_module = sys.modules[__name__]
for builtin_name in ('_warnings',):
for builtin_name in ('_thread', '_warnings', '_weakref'):
if builtin_name not in sys.modules:
builtin_module = _builtin_from_name(builtin_name)
else:
builtin_module = sys.modules[builtin_name]
setattr(self_module, builtin_name, builtin_module)
# Directly load the _thread module (needed during bootstrap).
try:
thread_module = _builtin_from_name('_thread')
except ImportError:
# Python was built without threads
thread_module = None
setattr(self_module, '_thread', thread_module)
# Directly load the _weakref module (needed during bootstrap).
weakref_module = _builtin_from_name('_weakref')
setattr(self_module, '_weakref', weakref_module)
def _install(sys_module, _imp_module):
"""Install importers for builtin and frozen modules"""