bpo-34287: Do not use second argument of METH_NOARGS functions (GH-8582)

This commit is contained in:
jdemeyer 2018-08-02 13:14:54 +02:00 committed by INADA Naoki
parent dd74369cb7
commit fc512e3e06
1 changed files with 21 additions and 21 deletions

View File

@ -403,7 +403,7 @@ buffered_dealloc(buffered *self)
} }
static PyObject * static PyObject *
buffered_sizeof(buffered *self, void *unused) buffered_sizeof(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
Py_ssize_t res; Py_ssize_t res;
@ -540,7 +540,7 @@ end:
/* detach */ /* detach */
static PyObject * static PyObject *
buffered_detach(buffered *self, PyObject *args) buffered_detach(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *raw, *res; PyObject *raw, *res;
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
@ -558,21 +558,21 @@ buffered_detach(buffered *self, PyObject *args)
/* Inquiries */ /* Inquiries */
static PyObject * static PyObject *
buffered_seekable(buffered *self, PyObject *args) buffered_seekable(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_seekable, NULL); return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_seekable, NULL);
} }
static PyObject * static PyObject *
buffered_readable(buffered *self, PyObject *args) buffered_readable(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readable, NULL); return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readable, NULL);
} }
static PyObject * static PyObject *
buffered_writable(buffered *self, PyObject *args) buffered_writable(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_writable, NULL); return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_writable, NULL);
@ -595,14 +595,14 @@ buffered_mode_get(buffered *self, void *context)
/* Lower-level APIs */ /* Lower-level APIs */
static PyObject * static PyObject *
buffered_fileno(buffered *self, PyObject *args) buffered_fileno(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_fileno, NULL); return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_fileno, NULL);
} }
static PyObject * static PyObject *
buffered_isatty(buffered *self, PyObject *args) buffered_isatty(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
CHECK_INITIALIZED(self) CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_isatty, NULL); return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_isatty, NULL);
@ -611,7 +611,7 @@ buffered_isatty(buffered *self, PyObject *args)
/* Serialization */ /* Serialization */
static PyObject * static PyObject *
buffered_getstate(buffered *self, PyObject *args) buffered_getstate(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"cannot serialize '%s' object", Py_TYPE(self)->tp_name); "cannot serialize '%s' object", Py_TYPE(self)->tp_name);
@ -1202,7 +1202,7 @@ _io__Buffered_readline_impl(buffered *self, Py_ssize_t size)
static PyObject * static PyObject *
buffered_tell(buffered *self, PyObject *args) buffered_tell(buffered *self, PyObject *Py_UNUSED(ignored))
{ {
Py_off_t pos; Py_off_t pos;
@ -2207,33 +2207,33 @@ bufferedrwpair_write(rwpair *self, PyObject *args)
} }
static PyObject * static PyObject *
bufferedrwpair_flush(rwpair *self, PyObject *args) bufferedrwpair_flush(rwpair *self, PyObject *Py_UNUSED(ignored))
{ {
return _forward_call(self->writer, &PyId_flush, args); return _forward_call(self->writer, &PyId_flush, NULL);
} }
static PyObject * static PyObject *
bufferedrwpair_readable(rwpair *self, PyObject *args) bufferedrwpair_readable(rwpair *self, PyObject *Py_UNUSED(ignored))
{ {
return _forward_call(self->reader, &PyId_readable, args); return _forward_call(self->reader, &PyId_readable, NULL);
} }
static PyObject * static PyObject *
bufferedrwpair_writable(rwpair *self, PyObject *args) bufferedrwpair_writable(rwpair *self, PyObject *Py_UNUSED(ignored))
{ {
return _forward_call(self->writer, &PyId_writable, args); return _forward_call(self->writer, &PyId_writable, NULL);
} }
static PyObject * static PyObject *
bufferedrwpair_close(rwpair *self, PyObject *args) bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *exc = NULL, *val, *tb; PyObject *exc = NULL, *val, *tb;
PyObject *ret = _forward_call(self->writer, &PyId_close, args); PyObject *ret = _forward_call(self->writer, &PyId_close, NULL);
if (ret == NULL) if (ret == NULL)
PyErr_Fetch(&exc, &val, &tb); PyErr_Fetch(&exc, &val, &tb);
else else
Py_DECREF(ret); Py_DECREF(ret);
ret = _forward_call(self->reader, &PyId_close, args); ret = _forward_call(self->reader, &PyId_close, NULL);
if (exc != NULL) { if (exc != NULL) {
_PyErr_ChainExceptions(exc, val, tb); _PyErr_ChainExceptions(exc, val, tb);
Py_CLEAR(ret); Py_CLEAR(ret);
@ -2242,9 +2242,9 @@ bufferedrwpair_close(rwpair *self, PyObject *args)
} }
static PyObject * static PyObject *
bufferedrwpair_isatty(rwpair *self, PyObject *args) bufferedrwpair_isatty(rwpair *self, PyObject *Py_UNUSED(ignored))
{ {
PyObject *ret = _forward_call(self->writer, &PyId_isatty, args); PyObject *ret = _forward_call(self->writer, &PyId_isatty, NULL);
if (ret != Py_False) { if (ret != Py_False) {
/* either True or exception */ /* either True or exception */
@ -2252,7 +2252,7 @@ bufferedrwpair_isatty(rwpair *self, PyObject *args)
} }
Py_DECREF(ret); Py_DECREF(ret);
return _forward_call(self->reader, &PyId_isatty, args); return _forward_call(self->reader, &PyId_isatty, NULL);
} }
static PyObject * static PyObject *