Fix Merge conflict

python · nanjekyejoannah · Sep 10, 2019 · Sep 10, 2019 · Sep 10, 2019 · Sep 10, 2019
commit 2e608fb4f032ab34a41b7e31966d576625a42225
diff --git a/Lib/test/test_interpreters.py b/Lib/test/test_interpreters.py
@@ -497,7 +497,6 @@ class TestSendRecv(TestBase):
 
     def test_fields(self):
         r, s = interpreters.create_channel()
-        self.assertGreaterEqual(r.id, 0)
         self.assertEqual([], r.interpreters)
 
     def test_send_recv_main(self):
@@ -685,15 +684,6 @@ def test_with_unused_items(self):
         with self.assertRaises(interpreters.ChannelClosedError):
             r.recv()
 
-    def test_never_used(self):
-        r, s = interpreters.create_channel()
-        s.release()
-
-        with self.assertRaises(interpreters.ChannelClosedError):
-            s.send(b'spam')
-        with self.assertRaises(interpreters.ChannelClosedError):
-            r.recv()
-
 class TestSendBuffer(TestBase):
     def test_send_recv_main(self):
         r, s = interpreters.create_channel()

diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
@@ -1570,14 +1570,13 @@ channel_id_converter(PyObject *arg, void *ptr)
     else {
         PyErr_Format(PyExc_TypeError,
                      "channel ID must be an int, got %.100s",
-                     arg->ob_type->tp_name);
+                     Py_TYPE(arg)->tp_name);
         return 0;
     }
     *(int64_t *)ptr = cid;
     return 1;
 }
 
-
 static channelid *
 newchannelid(PyTypeObject *cls, int64_t cid, int end, _channels *channels,
              int force, int resolve)
@@ -2553,14 +2552,10 @@ static PyObject *
 channel_send_buffer(PyObject *self, PyObject *args, PyObject *kwds)
 {
     static char *kwlist[] = {"cid", "obj", NULL};
-    PyObject *id;
+    int64_t cid;
     PyObject *obj;
-    if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                                     "OO:channel_send_buffer", kwlist, &id, &obj)) {
-        return NULL;
-    }
-    int64_t cid = _Py_CoerceID(id);
-    if (cid < 0) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&O:channel_send", kwlist,
+                                     channel_id_converter, &cid, &obj)) {
         return NULL;
     }