[Python-checkins] r54369 - python/branches/release25-maint/Python/import.c

[collin.winter]

Author: collin.winter
Date: Wed Mar 14 00:04:29 2007
New Revision: 54369

Modified:
   python/branches/release25-maint/Python/import.c
Log:
Inline PyImport_GetModulesReloading(). Backport from r54368.

Modified: python/branches/release25-maint/Python/import.c
==============================================================================
--- python/branches/release25-maint/Python/import.c	(original)
+++ python/branches/release25-maint/Python/import.c	Wed Mar 14 00:04:29 2007
@@ -339,15 +339,6 @@
 	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 @@
 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 @@
 	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,