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

This commit is contained in:
Serhiy Storchaka 2018-11-27 13:05:02 +02:00 committed by GitHub
parent 4a934d490f
commit 81524022d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions

View File

@ -1310,7 +1310,7 @@ deque_traverse(dequeobject *deque, visitproc visit, void *arg)
} }
static PyObject * static PyObject *
deque_reduce(dequeobject *deque) deque_reduce(dequeobject *deque, PyObject *Py_UNUSED(ignored))
{ {
PyObject *dict, *it; PyObject *dict, *it;
_Py_IDENTIFIER(__dict__); _Py_IDENTIFIER(__dict__);

View File

@ -414,24 +414,24 @@ PyTypeObject PyCursesWindow_Type;
#define Window_NoArgNoReturnFunction(X) \ #define Window_NoArgNoReturnFunction(X) \
static PyObject *PyCursesWindow_ ## X \ static PyObject *PyCursesWindow_ ## X \
(PyCursesWindowObject *self, PyObject *args) \ (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored)) \
{ return PyCursesCheckERR(X(self->win), # X); } { return PyCursesCheckERR(X(self->win), # X); }
#define Window_NoArgTrueFalseFunction(X) \ #define Window_NoArgTrueFalseFunction(X) \
static PyObject * PyCursesWindow_ ## X \ static PyObject * PyCursesWindow_ ## X \
(PyCursesWindowObject *self) \ (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored)) \
{ \ { \
return PyBool_FromLong(X(self->win)); } return PyBool_FromLong(X(self->win)); }
#define Window_NoArgNoReturnVoidFunction(X) \ #define Window_NoArgNoReturnVoidFunction(X) \
static PyObject * PyCursesWindow_ ## X \ static PyObject * PyCursesWindow_ ## X \
(PyCursesWindowObject *self) \ (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored)) \
{ \ { \
X(self->win); Py_RETURN_NONE; } X(self->win); Py_RETURN_NONE; }
#define Window_NoArg2TupleReturnFunction(X, TYPE, ERGSTR) \ #define Window_NoArg2TupleReturnFunction(X, TYPE, ERGSTR) \
static PyObject * PyCursesWindow_ ## X \ static PyObject * PyCursesWindow_ ## X \
(PyCursesWindowObject *self) \ (PyCursesWindowObject *self, PyObject *Py_UNUSED(ignored)) \
{ \ { \
TYPE arg1, arg2; \ TYPE arg1, arg2; \
X(self->win,arg1,arg2); return Py_BuildValue(ERGSTR, arg1, arg2); } X(self->win,arg1,arg2); return Py_BuildValue(ERGSTR, arg1, arg2); }

View File

@ -947,7 +947,7 @@ test_buildvalue_N_error(const char *fmt)
} }
static PyObject * static PyObject *
test_buildvalue_N(PyObject *self, PyObject *noargs) test_buildvalue_N(PyObject *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *arg, *res; PyObject *arg, *res;
@ -2457,7 +2457,7 @@ pending_threadfunc(PyObject *self, PyObject *arg)
/* Some tests of PyUnicode_FromFormat(). This needs more tests. */ /* Some tests of PyUnicode_FromFormat(). This needs more tests. */
static PyObject * static PyObject *
test_string_from_format(PyObject *self, PyObject *args) test_string_from_format(PyObject *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *result; PyObject *result;
char *msg; char *msg;
@ -2597,7 +2597,7 @@ typedef struct {
} known_capsule; } known_capsule;
static PyObject * static PyObject *
test_capsule(PyObject *self, PyObject *args) test_capsule(PyObject *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *object; PyObject *object;
const char *error = NULL; const char *error = NULL;
@ -2968,7 +2968,7 @@ make_memoryview_from_NULL_pointer(PyObject *self, PyObject *Py_UNUSED(ignored))
} }
static PyObject * 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 data[9] = {-1,-1,-1,-1,-1,-1,-1,-1,-1};
int init[5] = {0, 1, 2, 3, 4}; int init[5] = {0, 1, 2, 3, 4};
@ -3021,7 +3021,7 @@ test_from_contiguous(PyObject* self, PyObject *noargs)
extern PyTypeObject _PyBytesIOBuffer_Type; extern PyTypeObject _PyBytesIOBuffer_Type;
static PyObject * 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; PyTypeObject *type = &_PyBytesIOBuffer_Type;
PyObject *b; PyObject *b;

View File

@ -4201,7 +4201,7 @@ dictviews_isdisjoint(PyObject *self, PyObject *other)
PyDoc_STRVAR(isdisjoint_doc, PyDoc_STRVAR(isdisjoint_doc,
"Return True if the view and the given iterable have a null intersection."); "Return True if the view and the given iterable have a null intersection.");
static PyObject* dictkeys_reversed(_PyDictViewObject *dv); static PyObject* dictkeys_reversed(_PyDictViewObject *dv, PyObject *Py_UNUSED(ignored));
PyDoc_STRVAR(reversed_keys_doc, PyDoc_STRVAR(reversed_keys_doc,
"Return a reverse iterator over the dict keys."); "Return a reverse iterator over the dict keys.");
@ -4254,7 +4254,7 @@ dictkeys_new(PyObject *dict, PyObject *Py_UNUSED(ignored))
} }
static PyObject * static PyObject *
dictkeys_reversed(_PyDictViewObject *dv) dictkeys_reversed(_PyDictViewObject *dv, PyObject *Py_UNUSED(ignored))
{ {
if (dv->dv_dict == NULL) { if (dv->dv_dict == NULL) {
Py_RETURN_NONE; Py_RETURN_NONE;

View File

@ -1804,7 +1804,7 @@ done:
PyDoc_STRVAR(reduce_doc, "Return state information for pickling"); PyDoc_STRVAR(reduce_doc, "Return state information for pickling");
static PyObject * static PyObject *
odictiter_reduce(odictiterobject *di) odictiter_reduce(odictiterobject *di, PyObject *Py_UNUSED(ignored))
{ {
/* copy the iterator state */ /* copy the iterator state */
odictiterobject tmp = *di; odictiterobject tmp = *di;