Skip to content

[3.13] gh-121596: Fix Sharing Interpreter Channels (gh-121597) #121600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericsnowcurrently merged 1 commit into from
Jul 10, 2024
+20 −2
Merged

[3.13] gh-121596: Fix Sharing Interpreter Channels (gh-121597) #121600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-121596: Fix Sharing Interpreter Channels (gh-121597) 
This fixes a mistake in gh-113012 and adds a test that verifies the fix.
(cherry picked from commit 35a67e3)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
  • Loading branch information
@ericsnowcurrently @miss-islington
ericsnowcurrently authored and miss-islington committed Jul 10, 2024
commit dd23d75b57a78b936e817e5ebdc68e056e41578e
18 changes: 18 additions & 0 deletions Lib/test/test_interpreters/test_channels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down