bpo-33012: Fix signatures of METH_NOARGS functions. (GH-10736) (GH-10748)

miss-islington · serhiy-storchaka · web-flow · commit d5c8bd8e4cc0 · 2018-11-27T10:51:07.000-08:00
(cherry picked from commit 8152402) (cherry picked from commit ad8ac54) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -1341,7 +1341,7 @@ deque_traverse(dequeobject *deque, visitproc visit, void *arg)
 }
 
 static PyObject *
-deque_reduce(dequeobject *deque)
+deque_reduce(dequeobject *deque, PyObject *Py_UNUSED(ignored))
 {
     PyObject *dict, *it;
     _Py_IDENTIFIER(__dict__);
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -414,27 +414,27 @@ PyTypeObject PyCursesWindow_Type;
    PARSESTR - format string for argument parsing
 */
 
-#define Window_NoArgNoReturnFunction(X)                 \
-    static PyObject *PyCursesWindow_ ## X               \
-    (PyCursesWindowObject *self, PyObject *args)        \
+#define Window_NoArgNoReturnFunction(X)                         \
+    static PyObject *PyCursesWindow_ ## X                       \
+    (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))  \
     { return PyCursesCheckERR(X(self->win), # X); }
 
 #define Window_NoArgTrueFalseFunction(X)                                \
     static PyObject * PyCursesWindow_ ## X                              \
-    (PyCursesWindowObject *self)                                        \
+    (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))          \
     {                                                                   \
         if (X (self->win) == FALSE) { Py_INCREF(Py_False); return Py_False; } \
         else { Py_INCREF(Py_True); return Py_True; } }
 
 #define Window_NoArgNoReturnVoidFunction(X)                     \
     static PyObject * PyCursesWindow_ ## X                      \
-    (PyCursesWindowObject *self)                                \
+    (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))  \
     {                                                           \
         X(self->win); Py_INCREF(Py_None); return Py_None; }
 
 #define Window_NoArg2TupleReturnFunction(X, TYPE, ERGSTR)               \
     static PyObject * PyCursesWindow_ ## X                              \
-    (PyCursesWindowObject *self)                                        \
+    (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored))          \
     {                                                                   \
         TYPE arg1, arg2;                                                \
         X(self->win,arg1,arg2); return Py_BuildValue(ERGSTR, arg1, arg2); }
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -952,7 +952,7 @@ test_buildvalue_N_error(const char *fmt)
 }
 
 static PyObject *
-test_buildvalue_N(PyObject *self, PyObject *noargs)
+test_buildvalue_N(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *arg, *res;
 
@@ -2351,7 +2351,7 @@ pending_threadfunc(PyObject *self, PyObject *arg)
 
 /* Some tests of PyUnicode_FromFormat().  This needs more tests. */
 static PyObject *
-test_string_from_format(PyObject *self, PyObject *args)
+test_string_from_format(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *result;
     char *msg;
@@ -2491,7 +2491,7 @@ typedef struct {
 } known_capsule;
 
 static PyObject *
-test_capsule(PyObject *self, PyObject *args)
+test_capsule(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *object;
     const char *error = NULL;
@@ -2863,7 +2863,7 @@ make_memoryview_from_NULL_pointer(PyObject *self)
 }
 
 static PyObject *
-test_from_contiguous(PyObject* self, PyObject *noargs)
+test_from_contiguous(PyObject* self, PyObject *Py_UNUSED(ignored))
 {
     int data[9] = {-1,-1,-1,-1,-1,-1,-1,-1,-1};
     int init[5] = {0, 1, 2, 3, 4};
@@ -2916,7 +2916,7 @@ test_from_contiguous(PyObject* self, PyObject *noargs)
 extern PyTypeObject _PyBytesIOBuffer_Type;
 
 static PyObject *
-test_pep3118_obsolete_write_locks(PyObject* self, PyObject *noargs)
+test_pep3118_obsolete_write_locks(PyObject* self, PyObject *Py_UNUSED(ignored))
 {
     PyTypeObject *type = &_PyBytesIOBuffer_Type;
     PyObject *b;
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -1889,7 +1889,7 @@ odictiter_iternext(odictiterobject *di)
 PyDoc_STRVAR(reduce_doc, "Return state information for pickling");
 
 static PyObject *
-odictiter_reduce(odictiterobject *di)
+odictiter_reduce(odictiterobject *di, PyObject *Py_UNUSED(ignored))
 {
     /* copy the iterator state */
     odictiterobject tmp = *di;

Original file line number	Diff line number	Diff line change
`@@ -1341,7 +1341,7 @@ deque_traverse(dequeobject deque, visitproc visit, void arg)`
`1341`	`1341`	`}`
`1342`	`1342`
`1343`	`1343`	`static PyObject *`
`1344`		`-deque_reduce(dequeobject *deque)`
	`1344`	`+deque_reduce(dequeobject deque, PyObject Py_UNUSED(ignored))`
`1345`	`1345`	`{`
`1346`	`1346`	`PyObject dict, it;`
`1347`	`1347`	`_Py_IDENTIFIER(__dict__);`
Original file line number	Diff line number	Diff line change
`@@ -952,7 +952,7 @@ test_buildvalue_N_error(const char *fmt)`
`952`	`952`	`}`
`953`	`953`
`954`	`954`	`static PyObject *`
`955`		`-test_buildvalue_N(PyObject self, PyObject noargs)`
	`955`	`+test_buildvalue_N(PyObject self, PyObject Py_UNUSED(ignored))`
`956`	`956`	`{`
`957`	`957`	`PyObject arg, res;`
`958`	`958`
`@@ -2351,7 +2351,7 @@ pending_threadfunc(PyObject self, PyObject arg)`
`2351`	`2351`
`2352`	`2352`	`/* Some tests of PyUnicode_FromFormat(). This needs more tests. */`
`2353`	`2353`	`static PyObject *`
`2354`		`-test_string_from_format(PyObject self, PyObject args)`
	`2354`	`+test_string_from_format(PyObject self, PyObject Py_UNUSED(ignored))`
`2355`	`2355`	`{`
`2356`	`2356`	`PyObject *result;`
`2357`	`2357`	`char *msg;`
`@@ -2491,7 +2491,7 @@ typedef struct {`
`2491`	`2491`	`} known_capsule;`
`2492`	`2492`
`2493`	`2493`	`static PyObject *`
`2494`		`-test_capsule(PyObject self, PyObject args)`
	`2494`	`+test_capsule(PyObject self, PyObject Py_UNUSED(ignored))`
`2495`	`2495`	`{`
`2496`	`2496`	`PyObject *object;`
`2497`	`2497`	`const char *error = NULL;`
`@@ -2863,7 +2863,7 @@ make_memoryview_from_NULL_pointer(PyObject *self)`
`2863`	`2863`	`}`
`2864`	`2864`
`2865`	`2865`	`static PyObject *`
`2866`		`-test_from_contiguous(PyObject* self, PyObject *noargs)`
	`2866`	`+test_from_contiguous(PyObject* self, PyObject *Py_UNUSED(ignored))`
`2867`	`2867`	`{`
`2868`	`2868`	`int data[9] = {-1,-1,-1,-1,-1,-1,-1,-1,-1};`
`2869`	`2869`	`int init[5] = {0, 1, 2, 3, 4};`
`@@ -2916,7 +2916,7 @@ test_from_contiguous(PyObject* self, PyObject *noargs)`
`2916`	`2916`	`extern PyTypeObject _PyBytesIOBuffer_Type;`
`2917`	`2917`
`2918`	`2918`	`static PyObject *`
`2919`		`-test_pep3118_obsolete_write_locks(PyObject* self, PyObject *noargs)`
	`2919`	`+test_pep3118_obsolete_write_locks(PyObject* self, PyObject *Py_UNUSED(ignored))`
`2920`	`2920`	`{`
`2921`	`2921`	`PyTypeObject *type = &_PyBytesIOBuffer_Type;`
`2922`	`2922`	`PyObject *b;`
Original file line number	Diff line number	Diff line change
`@@ -1889,7 +1889,7 @@ odictiter_iternext(odictiterobject *di)`
`1889`	`1889`	`PyDoc_STRVAR(reduce_doc, "Return state information for pickling");`
`1890`	`1890`
`1891`	`1891`	`static PyObject *`
`1892`		`-odictiter_reduce(odictiterobject *di)`
	`1892`	`+odictiter_reduce(odictiterobject di, PyObject Py_UNUSED(ignored))`
`1893`	`1893`	`{`
`1894`	`1894`	`/* copy the iterator state */`
`1895`	`1895`	`odictiterobject tmp = *di;`