mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 18:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge w/ 3.3 more fixes thanks to issue #17098

Browse source
This commit is contained in:
Brett Cannon 2013-02-01 16:36:29 -05:00
commit 85ae3566d1
3 changed files with 296 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/importlib/_bootstrap.py
View file

@ -1724,10 +1724,13 @@ def _setup(sys_module, _imp_module):
BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
module_type = type(sys)
for module in sys.modules.values():
for name, module in sys.modules.items():
if isinstance(module, module_type):
if not hasattr(module, '__loader__'):
module.__loader__ = BuiltinImporter
if name in sys.builtin_module_names:
module.__loader__ = BuiltinImporter
elif _imp.is_frozen(name):
module.__loader__ = FrozenImporter
self_module = sys.modules[__name__]
for builtin_name in ('_io', '_warnings', 'builtins', 'marshal'):