mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules.

Browse source
This commit is contained in:
Eric Snow 2013-10-31 22:22:15 -06:00
parent dcdd05b0b4
commit cdf601281f
5 changed files with 642 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/importlib/__init__.py
View file

@ -107,7 +107,7 @@ def reload(module):
if not module or not isinstance(module, types.ModuleType):
raise TypeError("reload() argument must be module")
name = module.__name__
if name not in sys.modules:
if sys.modules.get(name) is not module:
msg = "module {} not in sys.modules"
raise ImportError(msg.format(name), name=name)
if name in _RELOADING:
@ -118,7 +118,11 @@ def reload(module):
if parent_name and parent_name not in sys.modules:
msg = "parent {!r} not in sys.modules"
raise ImportError(msg.format(parent_name), name=parent_name)
module.__loader__.load_module(name)
loader = _bootstrap._find_module(name, None)
if loader is None:
raise ImportError(_bootstrap._ERR_MSG.format(name), name=name)
module.__loader__ = loader
loader.load_module(name)
# The module may have replaced itself in sys.modules!
return sys.modules[module.__name__]
finally: