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

Inline PyImport_GetModulesReloading(). Backport from r54368.

This commit is contained in:
Collin Winter 2007-03-13 23:04:29 +00:00
parent afa4f485dd
commit 2a98ff8eed
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Python/import.c
View File

@ -339,15 +339,6 @@ imp_release_lock(PyObject *self, PyObject *noargs)
return Py_None;
}
PyObject *
PyImport_GetModulesReloading(void)
{
PyInterpreterState *interp = PyThreadState_Get()->interp;
if (interp->modules_reloading == NULL)
Py_FatalError("PyImport_GetModuleDict: no modules_reloading dictionary!");
return interp->modules_reloading;
}
static void
imp_modules_reloading_clear (void)
{
@ -2420,7 +2411,8 @@ import_submodule(PyObject *mod, char *subname, char *fullname)
PyObject *
PyImport_ReloadModule(PyObject *m)
{
PyObject *modules_reloading = PyImport_GetModulesReloading();
PyInterpreterState *interp = PyThreadState_Get()->interp;
PyObject *modules_reloading = interp->modules_reloading;
PyObject *modules = PyImport_GetModuleDict();
PyObject *path = NULL, *loader = NULL, *existing_m = NULL;
char *name, *subname;
@ -2428,6 +2420,12 @@ PyImport_ReloadModule(PyObject *m)
struct filedescr *fdp;
FILE *fp = NULL;
PyObject *newm;
if (modules_reloading == NULL) {
Py_FatalError("PyImport_ReloadModule: "
"no modules_reloading dictionary!");
return NULL;
}
if (m == NULL || !PyModule_Check(m)) {
PyErr_SetString(PyExc_TypeError,