[Python-checkins] r87251 - in python/branches/py3k: Lib/test/test_import.py Misc/NEWS Objects/moduleobject.c

Wed Dec 15 00:06:26 CET 2010

Author: r.david.murray
Date: Wed Dec 15 00:06:25 2010
New Revision: 87251
Log:
#4236: avoid possible Fatal Error when import is called from __del__
Patch by Simon Cross, crasher test code by Martin von Löwis.
Modified:
 python/branches/py3k/Lib/test/test_import.py
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Objects/moduleobject.c
Modified: python/branches/py3k/Lib/test/test_import.py
==============================================================================

--- python/branches/py3k/Lib/test/test_import.py	(original)
+++ python/branches/py3k/Lib/test/test_import.py	Wed Dec 15 00:06:25 2010
@@ -9,11 +9,13 @@
 import stat
 import sys
 import unittest
+import textwrap
 
 from test.support import (
 EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
 make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
 unlink, unload)
+from test import script_helper
 
 
 def remove_files(name):
@@ -284,6 +286,17 @@
 self.assertEqual("Import by filename is not supported.",
 c.exception.args[0])
 
+ 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
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Dec 15 00:06:25 2010
@@ -7,6 +7,12 @@
 
 *Release date: XXXX-XX-XX*
 
+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__.
 
 Library
 -------
Modified: python/branches/py3k/Objects/moduleobject.c
==============================================================================
--- python/branches/py3k/Objects/moduleobject.c	(original)
+++ python/branches/py3k/Objects/moduleobject.c	Wed Dec 15 00:06:25 2010
@@ -63,8 +63,9 @@
 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) {
