summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2013-08-15 00:11:09 (GMT)
committerEric Snow <ericsnowcurrently@gmail.com>2013-08-15 00:11:09 (GMT)
commit8e4554027b8ba1e6fc3b9e1a67d3333a3399a6d6 (patch)
tree7b33f885875ae3fe783d6599e1010cfaefc0ad27
parent01dbca0b0626c7846d917883e6b7b5667c4fe6ba (diff)
downloadcpython-8e4554027b8ba1e6fc3b9e1a67d3333a3399a6d6.zip
cpython-8e4554027b8ba1e6fc3b9e1a67d3333a3399a6d6.tar.gz
cpython-8e4554027b8ba1e6fc3b9e1a67d3333a3399a6d6.tar.bz2
Closes issue #18698: ensure importlib.reload() returns the module out of sys.modules.
-rw-r--r--Lib/importlib/__init__.py4
-rw-r--r--Lib/test/test_importlib/test_api.py16
-rw-r--r--Misc/NEWS2
3 files changed, 21 insertions, 1 deletions
diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py
index 6732977..69ca9ce 100644
--- a/Lib/importlib/__init__.py
+++ b/Lib/importlib/__init__.py
@@ -118,7 +118,9 @@ 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)
- return module.__loader__.load_module(name)
+ module.__loader__.load_module(name)
+ # The module may have replaced itself in sys.modules!
+ return sys.modules[module.__name__]
finally:
try:
del _RELOADING[name]
diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py
index 3a28cb7..0c0e851 100644
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -162,6 +162,22 @@ class ReloadTests(unittest.TestCase):
module = importlib.import_module(mod)
importlib.reload(module)
+ def test_module_replaced(self):
+ def code():
+ import sys
+ module = type(sys)('top_level')
+ module.spam = 3
+ sys.modules['top_level'] = module
+ mock = util.mock_modules('top_level',
+ module_code={'top_level': code})
+ with mock:
+ with util.import_state(meta_path=[mock]):
+ module = importlib.import_module('top_level')
+ reloaded = importlib.reload(module)
+ actual = sys.modules['top_level']
+ self.assertEqual(actual.spam, 3)
+ self.assertEqual(reloaded.spam, 3)
+
class InvalidateCacheTests(unittest.TestCase):
diff --git a/Misc/NEWS b/Misc/NEWS
index e1af655..df728ea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -203,6 +203,8 @@ Core and Builtins
- Issue #17867: Raise an ImportError if __import__ is not found in __builtins__.
+- Issue #18698: Ensure importlib.reload() returns the module out of sys.modules.
+
- Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3,
such as was shipped with Centos 5 and Mac OS X 10.4.