summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/Python/import.c b/Python/import.c
index 61e4313..8f81d6e 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2252,7 +2252,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;
@@ -2295,11 +2295,17 @@ 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;
- newm = load_module(name, fp, buf, fdp->type, NULL);
+ }
+
+ newm = load_module(name, fp, buf, fdp->type, loader);
+ Py_XDECREF(loader);
+
if (fp)
fclose(fp);
if (newm == NULL) {