Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-34287: do not use second argument of METH_NOARGS functions #8582

Merged
merged 1 commit into from
Aug 2, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Modules/_io/bufferedio.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ buffered_dealloc(buffered *self)
}

static PyObject *
buffered_sizeof(buffered *self, void *unused)
buffered_sizeof(buffered *self, PyObject *Py_UNUSED(ignored))
{
Py_ssize_t res;

Expand Down Expand Up @@ -540,7 +540,7 @@ buffered_close(buffered *self, PyObject *args)
/* detach */

static PyObject *
buffered_detach(buffered *self, PyObject *args)
buffered_detach(buffered *self, PyObject *Py_UNUSED(ignored))
{
PyObject *raw, *res;
CHECK_INITIALIZED(self)
Expand All @@ -558,21 +558,21 @@ buffered_detach(buffered *self, PyObject *args)
/* Inquiries */

static PyObject *
buffered_seekable(buffered *self, PyObject *args)
buffered_seekable(buffered *self, PyObject *Py_UNUSED(ignored))
{
CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_seekable, NULL);
}

static PyObject *
buffered_readable(buffered *self, PyObject *args)
buffered_readable(buffered *self, PyObject *Py_UNUSED(ignored))
{
CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readable, NULL);
}

static PyObject *
buffered_writable(buffered *self, PyObject *args)
buffered_writable(buffered *self, PyObject *Py_UNUSED(ignored))
{
CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_writable, NULL);
Expand All @@ -595,14 +595,14 @@ buffered_mode_get(buffered *self, void *context)
/* Lower-level APIs */

static PyObject *
buffered_fileno(buffered *self, PyObject *args)
buffered_fileno(buffered *self, PyObject *Py_UNUSED(ignored))
{
CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_fileno, NULL);
}

static PyObject *
buffered_isatty(buffered *self, PyObject *args)
buffered_isatty(buffered *self, PyObject *Py_UNUSED(ignored))
{
CHECK_INITIALIZED(self)
return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_isatty, NULL);
Expand All @@ -611,7 +611,7 @@ buffered_isatty(buffered *self, PyObject *args)
/* Serialization */

static PyObject *
buffered_getstate(buffered *self, PyObject *args)
buffered_getstate(buffered *self, PyObject *Py_UNUSED(ignored))
{
PyErr_Format(PyExc_TypeError,
"cannot serialize '%s' object", Py_TYPE(self)->tp_name);
Expand Down Expand Up @@ -1202,7 +1202,7 @@ _io__Buffered_readline_impl(buffered *self, Py_ssize_t size)


static PyObject *
buffered_tell(buffered *self, PyObject *args)
buffered_tell(buffered *self, PyObject *Py_UNUSED(ignored))
{
Py_off_t pos;

Expand Down Expand Up @@ -2207,33 +2207,33 @@ bufferedrwpair_write(rwpair *self, PyObject *args)
}

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 *
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 *
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 *
bufferedrwpair_close(rwpair *self, PyObject *args)
bufferedrwpair_close(rwpair *self, PyObject *Py_UNUSED(ignored))
{
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)
PyErr_Fetch(&exc, &val, &tb);
else
Py_DECREF(ret);
ret = _forward_call(self->reader, &PyId_close, args);
ret = _forward_call(self->reader, &PyId_close, NULL);
if (exc != NULL) {
_PyErr_ChainExceptions(exc, val, tb);
Py_CLEAR(ret);
Expand All @@ -2242,17 +2242,17 @@ bufferedrwpair_close(rwpair *self, PyObject *args)
}

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) {
/* either True or exception */
return ret;
}
Py_DECREF(ret);

return _forward_call(self->reader, &PyId_isatty, args);
return _forward_call(self->reader, &PyId_isatty, NULL);
}

static PyObject *
Expand Down