mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 20:56:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix reload() for package submodules.

Browse source
This commit is contained in:
Guido van Rossum 1997-09-06 19:41:09 +00:00
parent 17fc85f2f5
commit 222ef56bbf
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Python/import.c
View file

@ -1306,7 +1306,8 @@ PyImport_ReloadModule(m)
PyObject *m; PyObject *m;
{ {
PyObject *modules = PyImport_GetModuleDict(); PyObject *modules = PyImport_GetModuleDict();
char *name; PyObject *path = NULL;
char *name, *subname;
char buf[MAXPATHLEN+1]; char buf[MAXPATHLEN+1];
struct filedescr *fdp; struct filedescr *fdp;
FILE *fp = NULL; FILE *fp = NULL;
@ -1325,8 +1326,29 @@ PyImport_ReloadModule(m)
name); name);
return NULL; return NULL;
} }
subname = strrchr(name, '.');
if (subname == NULL)
subname = name;
else {
PyObject *parentname, *parent;
parentname = PyString_FromStringAndSize(name, (subname-name));
if (parentname == NULL)
return NULL;
parent = PyDict_GetItem(modules, parentname);
if (parent == NULL) {
PyErr_Format(PyExc_ImportError,
"reload(): parent %.200s not in sys.modules",
name);
return NULL;
}
subname++;
path = PyObject_GetAttrString(parent, "__path__");
if (path == NULL)
PyErr_Clear();
}
buf[0] = '\0'; buf[0] = '\0';
fdp = find_module(name, (PyObject *)NULL, buf, MAXPATHLEN+1, &fp); fdp = find_module(subname, path, buf, MAXPATHLEN+1, &fp);
Py_XDECREF(path);
if (fdp == NULL) if (fdp == NULL)
return NULL; return NULL;
m = load_module(name, fp, buf, fdp->type); m = load_module(name, fp, buf, fdp->type);