Skip to content

gh-76785: Module-level Fixes for test.support.interpreters #110236

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 9 commits into from
Oct 2, 2023
Merged

gh-76785: Module-level Fixes for test.support.interpreters #110236

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e958fbc
Add RecvChannel.close() and SendChannel.close().
ericsnowcurrently Sep 11, 2023
74b3003
Expose additional exception types.
ericsnowcurrently Sep 11, 2023
e424ab5
Call _channels._channel_id() in _ChannelEnd.__init__().
ericsnowcurrently Sep 12, 2023
90d024d
Factor out _get_current_module_state().
ericsnowcurrently Sep 12, 2023
996596b
Make RecvChannel and SendChannel shareable.
ericsnowcurrently Sep 12, 2023
56fec10
Import the interpreters module if needed.
ericsnowcurrently Sep 19, 2023
b3f29ce
Use _get_current_channel_end_type() in _channel_from_cid().
ericsnowcurrently Sep 19, 2023
cac4a76
Add tests.
ericsnowcurrently Oct 2, 2023
a8f6e5e
Fix _ChannelEnd.__init__().
ericsnowcurrently Oct 2, 2023
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
Prev Previous commit
Next Next commit
Use _get_current_channel_end_type() in _channel_from_cid().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 29, 2023
commit b3f29ceaa82074e3fba6c3e77e14520ced7921b6
15 changes: 3 additions & 12 deletions Modules/_xxinterpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,21 +1803,12 @@ channelid_richcompare(PyObject *self, PyObject *other, int op)
return res;
}

static PyTypeObject * _get_current_channel_end_type(int end);

static PyObject *
_channel_from_cid(PyObject *cid, int end)
{
PyObject *highlevel = PyImport_ImportModule("interpreters");
if (highlevel == NULL) {
PyErr_Clear();
highlevel = PyImport_ImportModule("test.support.interpreters");
if (highlevel == NULL) {
return NULL;
}
}
const char *clsname = (end == CHANNEL_RECV) ? "RecvChannel" :
"SendChannel";
PyObject *cls = PyObject_GetAttrString(highlevel, clsname);
Py_DECREF(highlevel);
PyObject *cls = (PyObject *)_get_current_channel_end_type(end);
if (cls == NULL) {
return NULL;
}
Expand Down