From 88c60c9668f0aa732693517a60b851cc1dfce0cb Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 18 Sep 2017 23:50:44 +0200 Subject: Trivial cleanups following bpo-31370 (#3649) * Trivial cleanups following bpo-31370 * Also cleanup the "importlib._bootstrap_external" module --- Lib/importlib/_bootstrap.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'Lib/importlib/_bootstrap.py') diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index fbd9392d41..755a634465 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -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""" -- cgit v1.2.1