10000 Revert "gh-99741: Clean Up the _xxsubinterpreters Module (gh-99940)" · ramvikrams/cpython@79983f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 79983f0

Browse files
ramvikramsramvikrams
authored
Revert "pythongh-99741: Clean Up the _xxsubinterpreters Module (pythongh-99940)"
This reverts commit 0547a98.
1 parent 922a6cf commit 79983f0

File tree

4 files changed

+310
-652
lines changed

4 files changed

+310
-652
lines changed

‎Include/cpython/pystate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ struct _xid {
394394

395395
PyAPI_FUNC(int) _PyObject_GetCrossInterpreterData(PyObject *, _PyCrossInterpreterData *);
396396
PyAPI_FUNC(PyObject *) _PyCrossInterpreterData_NewObject(_PyCrossInterpreterData *);
397-
PyAPI_FUNC(int) _PyCrossInterpreterData_Release(_PyCrossInterpreterData *);
397+
PyAPI_FUNC(void) _PyCrossInterpreterData_Release(_PyCrossInterpreterData *);
398398

399399
PyAPI_FUNC(int) _PyObject_CheckCrossInterpreterData(PyObject *);
400400

‎Lib/test/test__xxsubinterpreters.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ def test_types(self):
386386
self._assert_values([
387387
b'spam',
388388
9999,
389+
self.cid,
389390
])
390391

391392
def test_bytes(self):
@@ -1212,18 +1213,6 @@ def test_equality(self):
12121213
self.assertFalse(cid1 != cid2)
12131214
self.assertTrue(cid1 != cid3)
12141215

1215-
def test_shareable(self):
1216-
chan = interpreters.channel_create()
1217-
1218-
obj = interpreters.channel_create()
1219-
interpreters.channel_send(chan, obj)
1220-
got = interpreters.channel_recv(chan)
1221-
1222-
self.assertEqual(got, obj)
1223-
self.assertIs(type(got), type(obj))
1224-
# XXX Check the following in the channel tests?
1225-
#self.assertIsNot(got, obj)
1226-
12271216

12281217
class ChannelTests(TestBase):
12291218

@@ -1556,19 +1545,6 @@ def test_recv_default(self):
15561545
self.assertEqual(obj5, b'eggs')
15571546
self.assertIs(obj6, default)
15581547

1559-
def test_recv_sending_interp_destroyed(self):
1560-
cid = interpreters.channel_create()
1561-
interp = interpreters.create()
1562-
interpreters.run_string(interp, dedent(f"""
1563-
import _xxsubinterpreters as _interpreters
1564-
_interpreters.channel_send({cid}, b'spam')
1565-
"""))
1566-
interpreters.destroy(interp)
1567-
1568-
with self.assertRaisesRegex(RuntimeError,
1569-
'unrecognized interpreter ID'):
1570-
interpreters.channel_recv(cid)
1571-
15721548
def test_run_string_arg_unresolved(self):
15731549
cid = interpreters.channel_create()
15741550
interp = interpreters.create()

0 commit comments

Comments
 (0)
0