https://github.com/python/cpython/commit/35a67e36aa7cb0fc915771327f58bb0c70213867
commit: 35a67e36aa7cb0fc915771327f58bb0c70213867
branch: main
author: Eric Snow <[email protected]>
committer: ericsnowcurrently <[email protected]>
date: 2024-07-10T21:31:09Z
summary:
gh-121596: Fix Sharing Interpreter Channels (gh-121597)
This fixes a mistake in gh-113012 and adds a test that verifies the fix.
files:
M Lib/test/test_interpreters/test_channels.py
M Modules/_interpchannelsmodule.c
diff --git a/Lib/test/test_interpreters/test_channels.py
b/Lib/test/test_interpreters/test_channels.py
index 68cc45d1a5e09f..6c37754142e361 100644
--- a/Lib/test/test_interpreters/test_channels.py
+++ b/Lib/test/test_interpreters/test_channels.py
@@ -48,6 +48,7 @@ def test_list_all(self):
self.assertEqual(after, created)
def test_shareable(self):
+ interp = interpreters.create()
rch, sch = channels.create()
self.assertTrue(
@@ -60,8 +61,25 @@ def test_shareable(self):
rch2 = rch.recv()
sch2 = rch.recv()
+ interp.prepare_main(rch=rch, sch=sch)
+ sch.send_nowait(rch)
+ sch.send_nowait(sch)
+ interp.exec(dedent("""
+ rch2 = rch.recv()
+ sch2 = rch.recv()
+ assert rch2 == rch
+ assert sch2 == sch
+
+ sch.send_nowait(rch2)
+ sch.send_nowait(sch2)
+ """))
+ rch3 = rch.recv()
+ sch3 = rch.recv()
+
self.assertEqual(rch2, rch)
self.assertEqual(sch2, sch)
+ self.assertEqual(rch3, rch)
+ self.assertEqual(sch3, sch)
def test_is_closed(self):
rch, sch = channels.create()
diff --git a/Modules/_interpchannelsmodule.c b/Modules/_interpchannelsmodule.c
index 47dbdeb9a37c44..f0447475c49116 100644
--- a/Modules/_interpchannelsmodule.c
+++ b/Modules/_interpchannelsmodule.c
@@ -2615,10 +2615,10 @@ _get_current_channelend_type(int end)
}
if (cls == NULL) {
// Force the module to be loaded, to register the type.
- PyObject *highlevel = PyImport_ImportModule("interpreters.channel");
+ PyObject *highlevel = PyImport_ImportModule("interpreters.channels");
if (highlevel == NULL) {
PyErr_Clear();
- highlevel =
PyImport_ImportModule("test.support.interpreters.channel");
+ highlevel =
PyImport_ImportModule("test.support.interpreters.channels");
if (highlevel == NULL) {
return NULL;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
