mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

bpo-33029: Fix signatures of getter and setter functions. (GH-10746)

Browse source 
Fix also return type for few other functions (clear, releasebuffer).
This commit is contained in:
Serhiy Storchaka 2018-11-27 19:34:35 +02:00 • committed by GitHub
parent 1005c84535
commit d4f9cf5545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 128 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Objects/exceptions.c
View file

@ -182,7 +182,7 @@ static PyMethodDef BaseException_methods[] = {
};
static PyObject *
BaseException_get_args(PyBaseExceptionObject *self)
BaseException_get_args(PyBaseExceptionObject *self, void *Py_UNUSED(ignored))
{
if (self->args == NULL) {
Py_RETURN_NONE;
@ -192,7 +192,7 @@ BaseException_get_args(PyBaseExceptionObject *self)
}
static int
BaseException_set_args(PyBaseExceptionObject *self, PyObject *val)
BaseException_set_args(PyBaseExceptionObject *self, PyObject *val, void *Py_UNUSED(ignored))
{
PyObject *seq;
if (val == NULL) {
@ -207,7 +207,7 @@ BaseException_set_args(PyBaseExceptionObject *self, PyObject *val)
}
static PyObject *
BaseException_get_tb(PyBaseExceptionObject *self)
BaseException_get_tb(PyBaseExceptionObject *self, void *Py_UNUSED(ignored))
{
if (self->traceback == NULL) {
Py_RETURN_NONE;
@ -217,7 +217,7 @@ BaseException_get_tb(PyBaseExceptionObject *self)
}
static int
BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb)
BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb, void *Py_UNUSED(ignored))
{
if (tb == NULL) {
PyErr_SetString(PyExc_TypeError, "__traceback__ may not be deleted");
@ -235,7 +235,8 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb)
}
static PyObject *
BaseException_get_context(PyObject *self) {
BaseException_get_context(PyObject *self, void *Py_UNUSED(ignored))
{
PyObject *res = PyException_GetContext(self);
if (res)
return res; /* new reference already returned above */
@ -243,7 +244,8 @@ BaseException_get_context(PyObject *self) {
}
static int
BaseException_set_context(PyObject *self, PyObject *arg) {
BaseException_set_context(PyObject *self, PyObject *arg, void *Py_UNUSED(ignored))
{
if (arg == NULL) {
PyErr_SetString(PyExc_TypeError, "__context__ may not be deleted");
return -1;
@ -262,7 +264,8 @@ BaseException_set_context(PyObject *self, PyObject *arg) {
}
static PyObject *
BaseException_get_cause(PyObject *self) {
BaseException_get_cause(PyObject *self, void *Py_UNUSED(ignored))
{
PyObject *res = PyException_GetCause(self);
if (res)
return res; /* new reference already returned above */
@ -270,7 +273,8 @@ BaseException_get_cause(PyObject *self) {
}
static int
BaseException_set_cause(PyObject *self, PyObject *arg) {
BaseException_set_cause(PyObject *self, PyObject *arg, void *Py_UNUSED(ignored))
{
if (arg == NULL) {
PyErr_SetString(PyExc_TypeError, "__cause__ may not be deleted");
return -1;
@ -293,10 +297,10 @@ static PyGetSetDef BaseException_getset[] = {
{"__dict__", PyObject_GenericGetDict, PyObject_GenericSetDict},
{"args", (getter)BaseException_get_args, (setter)BaseException_set_args},
{"__traceback__", (getter)BaseException_get_tb, (setter)BaseException_set_tb},
{"__context__", (getter)BaseException_get_context,
(setter)BaseException_set_context, PyDoc_STR("exception context")},
{"__cause__", (getter)BaseException_get_cause,
(setter)BaseException_set_cause, PyDoc_STR("exception cause")},
{"__context__", BaseException_get_context,
BaseException_set_context, PyDoc_STR("exception context")},
{"__cause__", BaseException_get_cause,
BaseException_set_cause, PyDoc_STR("exception cause")},
{NULL},
};
@ -311,7 +315,7 @@ PyException_GetTraceback(PyObject *self) {
int
PyException_SetTraceback(PyObject *self, PyObject *tb) {
return BaseException_set_tb((PyBaseExceptionObject *)self, tb);
return BaseException_set_tb((PyBaseExceptionObject *)self, tb, NULL);
}
PyObject *