gh-134557: Revert "gh-132775: Use _PyCode GetScriptXIData()" (gh-134599)

ericsnowcurrently · web-flow · commit 8a793c4a365d · 2025-05-23T20:04:20.000Z
This reverts commit 09e72cf, AKA gh-134511. We are reverting due to refleaks on free-threaded builds.
diff --git a/Lib/test/support/interpreters/channels.py b/Lib/test/support/interpreters/channels.py
@@ -69,7 +69,7 @@ def list_all():
         if not hasattr(send, '_unboundop'):
             send._set_unbound(unboundop)
         else:
-            assert send._unbound[0] == unboundop
+            assert send._unbound[0] == op
         channels.append(chan)
     return channels
 
diff --git a/Lib/test/test__interpreters.py b/Lib/test/test__interpreters.py
@@ -474,15 +474,13 @@ def setUp(self):
 
     def test_signatures(self):
         # See https://github.com/python/cpython/issues/126654
-        msg = r'_interpreters.exec\(\) argument 3 must be dict, not int'
+        msg = "expected 'shared' to be a dict"
         with self.assertRaisesRegex(TypeError, msg):
             _interpreters.exec(self.id, 'a', 1)
         with self.assertRaisesRegex(TypeError, msg):
             _interpreters.exec(self.id, 'a', shared=1)
-        msg = r'_interpreters.run_string\(\) argument 3 must be dict, not int'
         with self.assertRaisesRegex(TypeError, msg):
             _interpreters.run_string(self.id, 'a', shared=1)
-        msg = r'_interpreters.run_func\(\) argument 3 must be dict, not int'
         with self.assertRaisesRegex(TypeError, msg):
             _interpreters.run_func(self.id, lambda: None, shared=1)
 
@@ -954,8 +952,7 @@ def test_invalid_syntax(self):
             """)
 
         with self.subTest('script'):
-            with self.assertRaises(SyntaxError):
-                _interpreters.run_string(self.id, script)
+            self.assert_run_failed(SyntaxError, script)
 
         with self.subTest('module'):
             modname = 'spam_spam_spam'
@@ -1022,19 +1019,12 @@ def script():
             with open(w, 'w', encoding="utf-8") as spipe:
                 with contextlib.redirect_stdout(spipe):
                     print('it worked!', end='')
-        failed = None
         def f():
-            nonlocal failed
-            try:
-                _interpreters.set___main___attrs(self.id, dict(w=w))
-                _interpreters.run_func(self.id, script)
-            except Exception as exc:
-                failed = exc
+            _interpreters.set___main___attrs(self.id, dict(w=w))
+            _interpreters.run_func(self.id, script)
         t = threading.Thread(target=f)
         t.start()
         t.join()
-        if failed:
-            raise Exception from failed
 
         with open(r, encoding="utf-8") as outfile:
             out = outfile.read()
@@ -1063,16 +1053,19 @@ def test_closure(self):
         spam = True
         def script():
             assert spam
-        with self.assertRaises(ValueError):
+
+        with self.assertRaises(TypeError):
             _interpreters.run_func(self.id, script)
 
+    # XXX This hasn't been fixed yet.
+    @unittest.expectedFailure
     def test_return_value(self):
         def script():
             return 'spam'
         with self.assertRaises(ValueError):
             _interpreters.run_func(self.id, script)
 
-#    @unittest.skip("we're not quite there yet")
+    @unittest.skip("we're not quite there yet")
     def test_args(self):
         with self.subTest('args'):
             def script(a, b=0):
diff --git a/Lib/test/test_interpreters/test_api.py b/Lib/test/test_interpreters/test_api.py
@@ -839,16 +839,9 @@ def test_bad_script(self):
             interp.exec(10)
 
     def test_bytes_for_script(self):
-        r, w = self.pipe()
-        RAN = b'R'
-        DONE = b'D'
         interp = interpreters.create()
-        interp.exec(f"""if True:
-            import os
-            os.write({w}, {RAN!r})
-            """)
-        os.write(w, DONE)
-        self.assertEqual(os.read(r, 1), RAN)
+        with self.assertRaises(TypeError):
+            interp.exec(b'print("spam")')
 
     def test_with_background_threads_still_running(self):
         r_interp, w_interp = self.pipe()
@@ -1017,6 +1010,8 @@ def test_call(self):
 
         for i, (callable, args, kwargs) in enumerate([
             (call_func_noop, (), {}),
+            (call_func_return_shareable, (), {}),
+            (call_func_return_not_shareable, (), {}),
             (Spam.noop, (), {}),
         ]):
             with self.subTest(f'success case #{i+1}'):
@@ -1041,8 +1036,6 @@ def test_call(self):
             (call_func_complex, ('custom', 'spam!'), {}),
             (call_func_complex, ('custom-inner', 'eggs!'), {}),
             (call_func_complex, ('???',), {'exc': ValueError('spam')}),
-            (call_func_return_shareable, (), {}),
-            (call_func_return_not_shareable, (), {}),
         ]):
             with self.subTest(f'invalid case #{i+1}'):
                 with self.assertRaises(Exception):
@@ -1058,6 +1051,8 @@ def test_call_in_thread(self):
 
         for i, (callable, args, kwargs) in enumerate([
             (call_func_noop, (), {}),
+            (call_func_return_shareable, (), {}),
+            (call_func_return_not_shareable, (), {}),
             (Spam.noop, (), {}),
         ]):
             with self.subTest(f'success case #{i+1}'):
@@ -1084,8 +1079,6 @@ def test_call_in_thread(self):
             (call_func_complex, ('custom', 'spam!'), {}),
             (call_func_complex, ('custom-inner', 'eggs!'), {}),
             (call_func_complex, ('???',), {'exc': ValueError('spam')}),
-            (call_func_return_shareable, (), {}),
-            (call_func_return_not_shareable, (), {}),
         ]):
             with self.subTest(f'invalid case #{i+1}'):
                 if args or kwargs:
@@ -1625,8 +1618,8 @@ def test_exec(self):
     def test_call(self):
         with self.subTest('no args'):
             interpid = _interpreters.create()
-            with self.assertRaises(ValueError):
-                _interpreters.call(interpid, call_func_return_shareable)
+            exc = _interpreters.call(interpid, call_func_return_shareable)
+            self.assertIs(exc, None)
 
         with self.subTest('uncaught exception'):
             interpid = _interpreters.create()
diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c
