diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-09-04 18:45:59 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-09-04 18:45:59 +0000 |
| commit | 70fe95e319967060876fa67286c44bfec0de545c (patch) | |
| tree | b0072397f3bd42067c5f3493fd2d859b61598921 /Python/importdl.c | |
| parent | 0419ede6b043d2f093550a333627952273b2e809 (diff) | |
| download | cpython-70fe95e319967060876fa67286c44bfec0de545c.tar.gz | |
Patch #794826: Add __file__ in dynamically loaded modules for multiple
interpreters. Fixes #698282. Will backport to 2.3.
Diffstat (limited to 'Python/importdl.c')
| -rw-r--r-- | Python/importdl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Python/importdl.c b/Python/importdl.c index c2400f7a3c..9c325e447d 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -54,8 +54,6 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp) _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 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp) /* 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", |