diff options
| author | Phillip J. Eby <pje@telecommunity.com> | 2004-09-23 05:19:27 (GMT) |
|---|---|---|
| committer | Phillip J. Eby <pje@telecommunity.com> | 2004-09-23 05:19:27 (GMT) |
| commit | 521cbc37af8912781d58336c8bb1fd523b91c421 (patch) | |
| tree | fe22240cb9e4574cecf84e750d47479096523a36 /Python/import.c | |
| parent | 6b154dfce9797db2a671b2e5e1f2dfef9e0e74f3 (diff) | |
| download | cpython-521cbc37af8912781d58336c8bb1fd523b91c421.zip cpython-521cbc37af8912781d58336c8bb1fd523b91c421.tar.gz cpython-521cbc37af8912781d58336c8bb1fd523b91c421.tar.bz2 | |
Fix for SF bug #1029475 : reload() doesn't work with PEP 302 loaders.
(Backport to 2.3 maintenance branch.)
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Python/import.c b/Python/import.c index 11aa2b4..3ca10be 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2310,7 +2310,7 @@ PyObject * PyImport_ReloadModule(PyObject *m) { PyObject *modules = PyImport_GetModuleDict(); - PyObject *path = NULL; + PyObject *path = NULL, *loader = NULL; char *name, *subname; char buf[MAXPATHLEN+1]; struct filedescr *fdp; @@ -2352,11 +2352,14 @@ PyImport_ReloadModule(PyObject *m) PyErr_Clear(); } buf[0] = '\0'; - fdp = find_module(name, subname, path, buf, MAXPATHLEN+1, &fp, NULL); + fdp = find_module(name, subname, path, buf, MAXPATHLEN+1, &fp, &loader); Py_XDECREF(path); - if (fdp == NULL) + if (fdp == NULL) { + Py_XDECREF(loader); return NULL; - m = load_module(name, fp, buf, fdp->type, NULL); + } + m = load_module(name, fp, buf, fdp->type, loader); + Py_XDECREF(loader); if (fp) fclose(fp); return m; |