bpo-38076 Clear the interpreter state only after clearing module glob…

bpo-38076 Clear the interpreter state only after clearing module glob… · python/cpython@4590f72

5 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -3683,7 +3683,7 @@ def _to_memoryview(buf):`
`3683`	`3683`
`3684`	`3684`	`class CTextIOWrapperTest(TextIOWrapperTest):`
`3685`	`3685`	`io = io`
`3686`		`-shutdown_error = "RuntimeError: could not find io module state"`
	`3686`	`+shutdown_error = "LookupError: unknown encoding: ascii"`
`3687`	`3687`
`3688`	`3688`	`def test_initialization(self):`
`3689`	`3689`	`r = self.BytesIO(b"\xc3\xa9\n\n")`

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import sys`
`8`	`8`
`9`	`9`	`from test import support`
	`10`	`+from test.support.script_helper import assert_python_ok`
`10`	`11`
`11`	`12`	`ISBIGENDIAN = sys.byteorder == "big"`
`12`	`13`
`@@ -652,6 +653,23 @@ def test_format_attr(self):`
`652`	`653`	`s2 = struct.Struct(s.format.encode())`
`653`	`654`	`self.assertEqual(s2.format, s.format)`
`654`	`655`
	`656`	`+def test_struct_cleans_up_at_runtime_shutdown(self):`
	`657`	`+code = """if 1:`
	`658`	`+ import struct`
	`659`	`+`
	`660`	`+ class C:`
	`661`	`+ def __init__(self):`
	`662`	`+ self.pack = struct.pack`
	`663`	`+ def __del__(self):`
	`664`	`+ self.pack('I', -42)`
	`665`	`+`
	`666`	`+ struct.x = C()`
	`667`	`+ """`
	`668`	`+rc, stdout, stderr = assert_python_ok("-c", code)`
	`669`	`+self.assertEqual(rc, 0)`
	`670`	`+self.assertEqual(stdout.rstrip(), b"")`
	`671`	`+self.assertIn(b"Exception ignored in:", stderr)`
	`672`	`+self.assertIn(b"C.__del__", stderr)`
`655`	`673`
`656`	`674`	`class UnpackIteratorTest(unittest.TestCase):`
`657`	`675`	`"""`

Original file line number	Diff line number	Diff line change
`@@ -855,6 +855,23 @@ def __del__(self, sys=sys):`
`855`	`855`	`self.assertIn(b'sys.flags', out[0])`
`856`	`856`	`self.assertIn(b'sys.float_info', out[1])`
`857`	`857`
	`858`	`+def test_sys_ignores_cleaning_up_user_data(self):`
	`859`	`+code = """if 1:`
	`860`	`+ import struct, sys`
	`861`	`+`
	`862`	`+ class C:`
	`863`	`+ def __init__(self):`
	`864`	`+ self.pack = struct.pack`
	`865`	`+ def __del__(self):`
	`866`	`+ self.pack('I', -42)`
	`867`	`+`
	`868`	`+ sys.x = C()`
	`869`	`+ """`
	`870`	`+rc, stdout, stderr = assert_python_ok('-c', code)`
	`871`	`+self.assertEqual(rc, 0)`
	`872`	`+self.assertEqual(stdout.rstrip(), b"")`
	`873`	`+self.assertEqual(stderr.rstrip(), b"")`
	`874`	`+`
`858`	`875`	`@unittest.skipUnless(hasattr(sys, 'getandroidapilevel'),`
`859`	`876`	`'need sys.getandroidapilevel()')`
`860`	`877`	`def test_getandroidapilevel(self):`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix to clear the interpreter state only after clearing module globals to`
	`2`	`+guarantee module state access from C Extensions during runtime destruction`

Original file line number	Diff line number	Diff line change
`@@ -568,8 +568,6 @@ _PyImport_Cleanup(PyThreadState *tstate)`
`568`	`568`	`_PyErr_Clear(tstate);`
`569`	`569`	`}`
`570`	`570`	`Py_XDECREF(dict);`
`571`		`-/* Clear module dict copies stored in the interpreter state */`
`572`		`-_PyInterpreterState_ClearModules(interp);`
`573`	`571`	`/* Collect references */`
`574`	`572`	`_PyGC_CollectNoFail();`
`575`	`573`	`/* Dump GC stats before it's too late, since it uses the warnings`
`@@ -621,6 +619,9 @@ _PyImport_Cleanup(PyThreadState *tstate)`
`621`	`619`	`}`
`622`	`620`	`_PyModule_ClearDict(interp->builtins);`
`623`	`621`
	`622`	`+/* Clear module dict copies stored in the interpreter state */`
	`623`	`+_PyInterpreterState_ClearModules(interp);`
	`624`	`+`
`624`	`625`	`/* Clear and delete the modules directory. Actual modules will`
`625`	`626`	`still be there only if imported during the execution of some`
`626`	`627`	`destructor. */`