commit 64a1e7cab1fe8f0b0b42b93bbd40e73fc983c138
author R. David Murray <rdmurray@bitdance.com> Wed Dec 15 01:36:03 2010 +0000
committer R. David Murray <rdmurray@bitdance.com> Wed Dec 15 01:36:03 2010 +0000
tree 26ea48b3229827183f286e8121d45e51ec627be0
parent 66ea7c32d21a5c8616a9fb79bfbe100af9bcb6a6

Merged revisions 87251 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87251 | r.david.murray | 2010-12-14 18:06:25 -0500 (Tue, 14 Dec 2010) | 4 lines

  #4236: avoid possible Fatal Error when import is called from __del__

  Patch by Simon Cross, crasher test code by Martin von Löwis.
........

Python/modsupport.c

diff --git a/Python/modsupport.c b/Python/modsupport.c
index 6ee48f3..8bdec8b 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -34,8 +34,9 @@
 {
     PyObject *m, *d, *v, *n;
     PyMethodDef *ml;
-    if (!Py_IsInitialized())
-        Py_FatalError("Interpreter not initialized (version mismatch?)");
+    PyInterpreterState *interp = PyThreadState_Get()->interp;
+    if (interp->modules == NULL)
+        Py_FatalError("Python import machinery not initialized");
     if (module_api_version != PYTHON_API_VERSION) {
         char message[512];
         PyOS_snprintf(message, sizeof(message),