Fix the C function signature for _collections._tuplegetter.__reduce__. (GH-12180)

serhiy-storchaka · web-flow · commit adfffc7343ce · 2019-03-05T18:41:09.000+02:00
Correctly fixes bpo-36197.
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -2441,7 +2441,7 @@ tuplegetter_dealloc(_tuplegetterobject *self)
 }
 
 static PyObject*
-tuplegetter_reduce(_tuplegetterobject *self)
+tuplegetter_reduce(_tuplegetterobject *self, PyObject *Py_UNUSED(ignored))
 {
     return Py_BuildValue("(O(nO))", (PyObject*) Py_TYPE(self), self->index, self->doc);
 }
@@ -2453,7 +2453,7 @@ static PyMemberDef tuplegetter_members[] = {
 };
 
 static PyMethodDef tuplegetter_methods[] = {
-    {"__reduce__", (PyCFunction)(void(*)(void))tuplegetter_reduce, METH_NOARGS, NULL},
+    {"__reduce__", (PyCFunction)tuplegetter_reduce, METH_NOARGS, NULL},
     {NULL},
 };
 

Original file line number	Diff line number	Diff line change
`@@ -2441,7 +2441,7 @@ tuplegetter_dealloc(_tuplegetterobject *self)`
`2441`	`2441`	`}`
`2442`	`2442`
`2443`	`2443`	`static PyObject*`
`2444`		`-tuplegetter_reduce(_tuplegetterobject *self)`
	`2444`	`+tuplegetter_reduce(_tuplegetterobject self, PyObject Py_UNUSED(ignored))`
`2445`	`2445`	`{`
`2446`	`2446`	`return Py_BuildValue("(O(nO))", (PyObject*) Py_TYPE(self), self->index, self->doc);`
`2447`	`2447`	`}`
`@@ -2453,7 +2453,7 @@ static PyMemberDef tuplegetter_members[] = {`
`2453`	`2453`	`};`
`2454`	`2454`
`2455`	`2455`	`static PyMethodDef tuplegetter_methods[] = {`
`2456`		`- {"__reduce__", (PyCFunction)(void(*)(void))tuplegetter_reduce, METH_NOARGS, NULL},`
	`2456`	`+ {"__reduce__", (PyCFunction)tuplegetter_reduce, METH_NOARGS, NULL},`
`2457`	`2457`	`{NULL},`
`2458`	`2458`	`};`
`2459`	`2459`