[Python-checkins] bpo-33454: Fix arguments parsing in _xxsubinterpreters.channel_close(). (GH-6747)
Serhiy Storchaka
webhook-mailer at python.org
Tue May 15 18:08:12 EDT 2018
https://github.com/python/cpython/commit/d8dcd57edb88ce57063e5c2b85fe0ee1abb1ce8b
commit: d8dcd57edb88ce57063e5c2b85fe0ee1abb1ce8b
branch: master
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-05-16T01:08:09+03:00
summary:
bpo-33454: Fix arguments parsing in _xxsubinterpreters.channel_close(). (GH-6747)
files:
M Modules/_xxsubinterpretersmodule.c
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
index 634823a7a271..f5e2ea3c79d6 100644
--- a/Modules/_xxsubinterpretersmodule.c
+++ b/Modules/_xxsubinterpretersmodule.c
@@ -2470,12 +2470,8 @@ PyDoc_STRVAR(channel_recv_doc,
Return a new object from the data at the from of the channel's queue.");
static PyObject *
-channel_close(PyObject *self, PyObject *args, PyObject *kwds)
+channel_close(PyObject *self, PyObject *id)
{
- PyObject *id;
- if (!PyArg_UnpackTuple(args, "channel_recv", 1, 1, &id)) {
- return NULL;
- }
int64_t cid = _coerce_id(id);
if (cid < 0) {
return NULL;
@@ -2570,8 +2566,8 @@ static PyMethodDef module_functions[] = {
METH_VARARGS, channel_send_doc},
{"channel_recv", (PyCFunction)channel_recv,
METH_VARARGS, channel_recv_doc},
- {"channel_close", (PyCFunction)channel_close,
- METH_VARARGS, channel_close_doc},
+ {"channel_close", channel_close,
+ METH_O, channel_close_doc},
{"channel_drop_interpreter", (PyCFunction)channel_drop_interpreter,
METH_VARARGS | METH_KEYWORDS, channel_drop_interpreter_doc},
{"_channel_id", (PyCFunction)channel__channel_id,
More information about the Python-checkins
mailing list