[Python-checkins] cpython (merge 3.5 -> 3.5): Merged in ncoghlan/cpython350 (pull request #17)

Mon Sep 7 07:38:01 CEST 2015

https://hg.python.org/cpython/rev/074c41ddce8f
changeset: 97726:074c41ddce8f
branch: 3.5
parent: 97693:8b81b7ad2d0a
parent: 97725:087464c9f982
user: Larry Hastings <larry at hastings.org>
date: Sat Sep 05 20:53:04 2015 -0700
summary:
 Merged in ncoghlan/cpython350 (pull request #17)
files:
 Lib/imp.py | 8 +++++++-
 Lib/test/imp_dummy.py | 3 +++
 Lib/test/test_imp.py | 24 ++++++++++++++++++++++++
 Misc/NEWS | 5 +++++
 Modules/_testmultiphase.c | 10 ++++++++++
 5 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/Lib/imp.py b/Lib/imp.py
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -334,6 +334,12 @@
 """
 import importlib.machinery
 loader = importlib.machinery.ExtensionFileLoader(name, path)
- return loader.load_module()
+
+ # Issue #24748: Skip the sys.modules check in _load_module_shim;
+ # always load new extension
+ spec = importlib.machinery.ModuleSpec(
+ name=name, loader=loader, origin=path)
+ return _load(spec)
+
 else:
 load_dynamic = None
diff --git a/Lib/test/imp_dummy.py b/Lib/test/imp_dummy.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/imp_dummy.py
@@ -0,0 +1,3 @@
+# Fodder for test of issue24748 in test_imp
+
+dummy_name = True
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -3,6 +3,7 @@
 except ImportError:
 _thread = None
 import importlib
+import importlib.util
 import os
 import os.path
 import shutil
@@ -275,6 +276,29 @@
 self.skipTest("found module doesn't appear to be a C extension")
 imp.load_module(name, None, *found[1:])
 
+ @requires_load_dynamic
+ def test_issue24748_load_module_skips_sys_modules_check(self):
+ name = 'test.imp_dummy'
+ try:
+ del sys.modules[name]
+ except KeyError:
+ pass
+ try:
+ module = importlib.import_module(name)
+ spec = importlib.util.find_spec('_testmultiphase')
+ module = imp.load_dynamic(name, spec.origin)
+ self.assertEqual(module.__name__, name)
+ self.assertEqual(module.__spec__.name, name)
+ self.assertEqual(module.__spec__.origin, spec.origin)
+ self.assertRaises(AttributeError, getattr, module, 'dummy_name')
+ self.assertEqual(module.int_const, 1969)
+ self.assertIs(sys.modules[name], module)
+ finally:
+ try:
+ del sys.modules[name]
+ except KeyError:
+ pass
+
 @unittest.skipIf(sys.dont_write_bytecode,
 "test meaningful only when writing bytecode")
 def test_bug7732(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,11 @@
 Library
 -------
 
+- Issue #24748: To resolve a compatibility problem found with py2exe and
+ pywin32, imp.load_dynamic() once again ignores previously loaded modules
+ to support Python modules replacing themselves with extension modules.
+ Patch by Petr Viktorin.
+
 - Issue #24917: time_strftime() Buffer Over-read. Patch by John Leitch.
 
 - Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c
--- a/Modules/_testmultiphase.c
+++ b/Modules/_testmultiphase.c
@@ -582,3 +582,13 @@
 {
 return PyModuleDef_Init(&def_exec_unreported_exception);
 }
+
+/*** Helper for imp test ***/
+
+static PyModuleDef imp_dummy_def = TEST_MODULE_DEF("imp_dummy", main_slots, testexport_methods);
+
+PyMODINIT_FUNC
+PyInit_imp_dummy(PyObject *spec)
+{
+ return PyModuleDef_Init(&imp_dummy_def);
+}
-- 
Repository URL: https://hg.python.org/cpython
