Patch #794826: Add __file__ in dynamically loaded modules for multiple
interpreters. Fixes #698282. Will backport to 2.3.
diff --git a/Python/importdl.c b/Python/importdl.c
index c2400f7..9c325e4 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -54,8 +54,6 @@
_Py_PackageContext = oldcontext;
if (PyErr_Occurred())
return NULL;
- if (_PyImport_FixupExtension(name, pathname) == NULL)
- return NULL;
m = PyDict_GetItemString(PyImport_GetModuleDict(), name);
if (m == NULL) {
@@ -66,6 +64,9 @@
/* Remember the filename as the __file__ attribute */
if (PyModule_AddStringConstant(m, "__file__", pathname) < 0)
PyErr_Clear(); /* Not important enough to report */
+
+ if (_PyImport_FixupExtension(name, pathname) == NULL)
+ return NULL;
if (Py_VerboseFlag)
PySys_WriteStderr(
"import %s # dynamically loaded from %s\n",