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

Fix some style nits: 

* lines too long
  * wrong indentation
  * space after a function name
  * wrong function name in error string
  * simplifying some logic

Also add an error check to PyDict_SetItemString.
This commit is contained in:
Neal Norwitz 2007-03-13 05:31:38 +00:00
parent 1ff06c7fc8
commit 75c7c80ee5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Python/import.c
View File

@ -345,18 +345,17 @@ PyImport_GetModulesReloading(void)
{
PyInterpreterState *interp = PyThreadState_Get()->interp;
if (interp->modules_reloading == NULL)
Py_FatalError("PyImport_GetModuleDict: no modules_reloading dictionary!");
Py_FatalError("PyImport_GetModulesReloading: "
"no modules_reloading dictionary!");
return interp->modules_reloading;
}
static void
imp_modules_reloading_clear (void)
imp_modules_reloading_clear(void)
{
PyInterpreterState *interp = PyThreadState_Get()->interp;
if (interp->modules_reloading == NULL)
return;
PyDict_Clear(interp->modules_reloading);
return;
if (interp->modules_reloading != NULL)
PyDict_Clear(interp->modules_reloading);
}
/* Helper for sys */
@ -2444,12 +2443,15 @@ PyImport_ReloadModule(PyObject *m)
name);
return NULL;
}
if ((existing_m = PyDict_GetItemString(modules_reloading, name)) != NULL) {
/* Due to a recursive reload, this module is already being reloaded. */
Py_INCREF(existing_m);
return existing_m;
existing_m = PyDict_GetItemString(modules_reloading, name);
if (existing_m != NULL) {
/* Due to a recursive reload, this module is already
being reloaded. */
Py_INCREF(existing_m);
return existing_m;
}
PyDict_SetItemString(modules_reloading, name, m);
if (PyDict_SetItemString(modules_reloading, name, m) < 0)
return NULL;
subname = strrchr(name, '.');
if (subname == NULL)
@ -2460,7 +2462,7 @@ PyImport_ReloadModule(PyObject *m)
if (parentname == NULL) {
imp_modules_reloading_clear();
return NULL;
}
}
parent = PyDict_GetItem(modules, parentname);
if (parent == NULL) {
PyErr_Format(PyExc_ImportError,
@ -2499,7 +2501,7 @@ PyImport_ReloadModule(PyObject *m)
*/
PyDict_SetItemString(modules, name, m);
}
imp_modules_reloading_clear ();
imp_modules_reloading_clear();
return newm;
}