https://github.com/python/cpython/commit/d5c8bd8e4cc04873254f0bd38895a6479c2... commit: d5c8bd8e4cc04873254f0bd38895a6479c23c8aa branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> committer: GitHub <noreply@github.com> date: 2018-11-27T10:51:07-08:00 summary: bpo-33012: Fix signatures of METH_NOARGS functions. (GH-10736) (GH-10748) (cherry picked from commit 81524022d0c0df7a41f9b2b2df41e2ebe140e610) (cherry picked from commit ad8ac54aa3d2323bdb5feb5e858a922840358187) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> files: M Modules/_collectionsmodule.c M Modules/_cursesmodule.c M Modules/_testcapimodule.c M Objects/odictobject.c diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 4fbf3bdb1463..25006fa2c975 100644 --- 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 index 8b46466d6f00..c048a7ddf2da 100644 --- 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 index 556d49bb3c83..067d46346a68 100644 --- 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 index f433cd2f4cec..fdeda43bbd81 100644 --- 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;