From: R. David Murray <rdmurray@bitdance.com>
Date: Tue, 14 Dec 2010 23:30:42 +0000 (+0000)
Subject: Merged revisions 87251 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=800dfee91a081547eaac9eabd5883998a5231324;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index e50cd5340f77..6f935c758105 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -9,10 +9,12 @@ import stat
 import sys
 import unittest
 import warnings
+import textwrap
 
 from test.support import (
     EnvironmentVarGuard, TESTFN, forget, is_jython,
     rmtree, run_unittest, unlink, unload)
+from test import script_helper
 
 
 def remove_files(name):
@@ -284,6 +286,17 @@ class ImportTests(unittest.TestCase):
         else:
             self.fail("import by path didn't raise an exception")
 
+    def test_import_in_del_does_not_crash(self):
+        # Issue 4236
+        testfn = script_helper.make_script('', TESTFN, textwrap.dedent("""\
+            import sys
+            class C:
+               def __del__(self):
+                  import imp
+            sys.argv.insert(0, C())
+            """))
+        script_helper.assert_python_ok(testfn)
+
 
 class PycRewritingTests(unittest.TestCase):
     # Test that the `co_filename` attribute on code objects always points
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b6dcba60ab6..cd670e7850fb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.1.4?
 Core and Builtins
 -----------------
 
+- Issue #4236: PyModule_Create2 now checks the import machinery directly
+  rather than the Py_IsInitialized flag, avoiding a Fatal Python
+  error in certain circumstances when an import is done in __del__.
+
 - Issue #10596: Fix float.__mod__ to have the same behaviour as
   float.__divmod__ with respect to signed zeros.  -4.0 % 4.0 should be
   0.0, not -0.0.
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 5dd9c017e05a..d96d7bd16a1a 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -67,8 +67,9 @@ PyModule_Create2(struct PyModuleDef* module, int module_api_version)
     PyMethodDef *ml;
     const char* name;
     PyModuleObject *m;
-    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 (PyType_Ready(&moduledef_type) < 0)
         return NULL;
     if (module->m_base.m_index == 0) {