Fix problem discovered by Greg McFarlane: when an imported module replaces its own entry in sys.module, reference count errors ensue; even if there is no reference count problem, it would be preferable for the import to yield the new thing in sys.modules anyway (if only because that's what later imports will yield). This opens the road to an official hack to implement a __getattr__ like feature for modules: stick an instance in sys.modules[__name__].

--- a/Python/import.c	Thu Jul 10 15:58:36 1997 +0000
+++ b/Python/import.c	Thu Jul 10 18:00:45 1997 +0000
@@ -182,6 +182,13 @@
 	if (v == NULL)
 		return NULL;
 	Py_DECREF(v);
+
+	if ((m = PyDict_GetItemString(_PyImport_Modules, name)) == NULL) {
+		PyErr_SetString(PyExc_SystemError,
+				"loaded module not found in sys.modules");
+		return NULL;
+	}
+
 	Py_INCREF(m);
 
 	return m;