traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #794826: Add __file__ in dynamically loaded modules for multiple 

interpreters. Fixes #698282. Will backport to 2.3.
This commit is contained in:
Martin v. Löwis 2003-09-04 18:45:59 +00:00
parent ef36537b81
commit e81e9b1d3b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Python/importdl.c
View File

@ -54,8 +54,6 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
_Py_PackageContext = oldcontext; _Py_PackageContext = oldcontext;
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
if (_PyImport_FixupExtension(name, pathname) == NULL)
return NULL;
m = PyDict_GetItemString(PyImport_GetModuleDict(), name); m = PyDict_GetItemString(PyImport_GetModuleDict(), name);
if (m == NULL) { if (m == NULL) {
@ -66,6 +64,9 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
/* Remember the filename as the __file__ attribute */ /* Remember the filename as the __file__ attribute */
if (PyModule_AddStringConstant(m, "__file__", pathname) < 0) if (PyModule_AddStringConstant(m, "__file__", pathname) < 0)
PyErr_Clear(); /* Not important enough to report */ PyErr_Clear(); /* Not important enough to report */
if (_PyImport_FixupExtension(name, pathname) == NULL)
return NULL;
if (Py_VerboseFlag) if (Py_VerboseFlag)
PySys_WriteStderr( PySys_WriteStderr(
"import %s # dynamically loaded from %s\n", "import %s # dynamically loaded from %s\n",