diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-11-27 09:58:07 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-27 09:58:07 -0800 |
commit | 5ceb7018dc63fab96f81d05e62bbe704e9f10cb9 (patch) | |
tree | 0cb8b6b5a3f6652b41b83003afa04a433f631385 /Objects | |
parent | d669154ee52048f98ac63ba177f3fd1cf62f0174 (diff) | |
download | cpython-git-5ceb7018dc63fab96f81d05e62bbe704e9f10cb9.tar.gz |
bpo-33029: Fix signatures of getter and setter functions. (GH-10746)
Fix also return type for few other functions (clear, releasebuffer).
(cherry picked from commit d4f9cf5545d6d8844e0726552ef2e366f5cc3abd)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/cellobject.c | 2 | ||||
-rw-r--r-- | Objects/descrobject.c | 14 | ||||
-rw-r--r-- | Objects/exceptions.c | 30 | ||||
-rw-r--r-- | Objects/frameobject.c | 7 | ||||
-rw-r--r-- | Objects/funcobject.c | 24 | ||||
-rw-r--r-- | Objects/genobject.c | 12 | ||||
-rw-r--r-- | Objects/memoryobject.c | 18 |
7 files changed, 56 insertions, 51 deletions
diff --git a/Objects/cellobject.c b/Objects/cellobject.c index 7b05e61ce4..6f8915ac92 100644 --- a/Objects/cellobject.c +++ b/Objects/cellobject.c @@ -111,7 +111,7 @@ cell_get_contents(PyCellObject *op, void *closure) } static int -cell_set_contents(PyCellObject *op, PyObject *obj) +cell_set_contents(PyCellObject *op, PyObject *obj, void *Py_UNUSED(ignored)) { Py_XINCREF(obj); Py_XSETREF(op->ob_ref, obj); diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 6014039402..c6f7e55ea5 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -439,7 +439,7 @@ calculate_qualname(PyDescrObject *descr) } static PyObject * -descr_get_qualname(PyDescrObject *descr) +descr_get_qualname(PyDescrObject *descr, void *Py_UNUSED(ignored)) { if (descr->d_qualname == NULL) descr->d_qualname = calculate_qualname(descr); @@ -1108,7 +1108,7 @@ static PyMemberDef wrapper_members[] = { }; static PyObject * -wrapper_objclass(wrapperobject *wp) +wrapper_objclass(wrapperobject *wp, void *Py_UNUSED(ignored)) { PyObject *c = (PyObject *)PyDescr_TYPE(wp->descr); @@ -1117,7 +1117,7 @@ wrapper_objclass(wrapperobject *wp) } static PyObject * -wrapper_name(wrapperobject *wp) +wrapper_name(wrapperobject *wp, void *Py_UNUSED(ignored)) { const char *s = wp->descr->d_base->name; @@ -1125,21 +1125,21 @@ wrapper_name(wrapperobject *wp) } static PyObject * -wrapper_doc(wrapperobject *wp, void *closure) +wrapper_doc(wrapperobject *wp, void *Py_UNUSED(ignored)) { return _PyType_GetDocFromInternalDoc(wp->descr->d_base->name, wp->descr->d_base->doc); } static PyObject * -wrapper_text_signature(wrapperobject *wp, void *closure) +wrapper_text_signature(wrapperobject *wp, void *Py_UNUSED(ignored)) { return _PyType_GetTextSignatureFromInternalDoc(wp->descr->d_base->name, wp->descr->d_base->doc); } static PyObject * -wrapper_qualname(wrapperobject *wp) +wrapper_qualname(wrapperobject *wp, void *Py_UNUSED(ignored)) { - return descr_get_qualname((PyDescrObject *)wp->descr); + return descr_get_qualname((PyDescrObject *)wp->descr, NULL); } static PyGetSetDef wrapper_getsets[] = { diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 2cce40f884..03bdf79de3 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -181,7 +181,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; @@ -191,7 +191,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) { @@ -206,7 +206,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; @@ -216,7 +216,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"); @@ -234,7 +234,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 */ @@ -242,7 +243,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; @@ -261,7 +263,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 */ @@ -269,7 +272,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; @@ -292,10 +296,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}, }; @@ -310,7 +314,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 * diff --git a/Objects/frameobject.c b/Objects/frameobject.c index f518dc4856..4ef10d0eb7 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -64,7 +64,7 @@ frame_getlineno(PyFrameObject *f, void *closure) * that time. */ static int -frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) +frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignored)) { int new_lineno = 0; /* The new value of f_lineno */ long l_new_lineno; @@ -519,7 +519,7 @@ frame_traverse(PyFrameObject *f, visitproc visit, void *arg) return 0; } -static void +static int frame_tp_clear(PyFrameObject *f) { PyObject **fastlocals, **p, **oldtop; @@ -547,6 +547,7 @@ frame_tp_clear(PyFrameObject *f) for (p = f->f_valuestack; p < oldtop; p++) Py_CLEAR(*p); } + return 0; } static PyObject * @@ -561,7 +562,7 @@ frame_clear(PyFrameObject *f) _PyGen_Finalize(f->f_gen); assert(f->f_gen == NULL); } - frame_tp_clear(f); + (void)frame_tp_clear(f); Py_RETURN_NONE; } diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 241685d5b7..413a590f17 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -242,14 +242,14 @@ static PyMemberDef func_memberlist[] = { }; static PyObject * -func_get_code(PyFunctionObject *op) +func_get_code(PyFunctionObject *op, void *Py_UNUSED(ignored)) { Py_INCREF(op->func_code); return op->func_code; } static int -func_set_code(PyFunctionObject *op, PyObject *value) +func_set_code(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { Py_ssize_t nfree, nclosure; @@ -277,14 +277,14 @@ func_set_code(PyFunctionObject *op, PyObject *value) } static PyObject * -func_get_name(PyFunctionObject *op) +func_get_name(PyFunctionObject *op, void *Py_UNUSED(ignored)) { Py_INCREF(op->func_name); return op->func_name; } static int -func_set_name(PyFunctionObject *op, PyObject *value) +func_set_name(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { /* Not legal to del f.func_name or to set it to anything * other than a string object. */ @@ -299,14 +299,14 @@ func_set_name(PyFunctionObject *op, PyObject *value) } static PyObject * -func_get_qualname(PyFunctionObject *op) +func_get_qualname(PyFunctionObject *op, void *Py_UNUSED(ignored)) { Py_INCREF(op->func_qualname); return op->func_qualname; } static int -func_set_qualname(PyFunctionObject *op, PyObject *value) +func_set_qualname(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { /* Not legal to del f.__qualname__ or to set it to anything * other than a string object. */ @@ -321,7 +321,7 @@ func_set_qualname(PyFunctionObject *op, PyObject *value) } static PyObject * -func_get_defaults(PyFunctionObject *op) +func_get_defaults(PyFunctionObject *op, void *Py_UNUSED(ignored)) { if (op->func_defaults == NULL) { Py_RETURN_NONE; @@ -331,7 +331,7 @@ func_get_defaults(PyFunctionObject *op) } static int -func_set_defaults(PyFunctionObject *op, PyObject *value) +func_set_defaults(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { /* Legal to del f.func_defaults. * Can only set func_defaults to NULL or a tuple. */ @@ -348,7 +348,7 @@ func_set_defaults(PyFunctionObject *op, PyObject *value) } static PyObject * -func_get_kwdefaults(PyFunctionObject *op) +func_get_kwdefaults(PyFunctionObject *op, void *Py_UNUSED(ignored)) { if (op->func_kwdefaults == NULL) { Py_RETURN_NONE; @@ -358,7 +358,7 @@ func_get_kwdefaults(PyFunctionObject *op) } static int -func_set_kwdefaults(PyFunctionObject *op, PyObject *value) +func_set_kwdefaults(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { if (value == Py_None) value = NULL; @@ -375,7 +375,7 @@ func_set_kwdefaults(PyFunctionObject *op, PyObject *value) } static PyObject * -func_get_annotations(PyFunctionObject *op) +func_get_annotations(PyFunctionObject *op, void *Py_UNUSED(ignored)) { if (op->func_annotations == NULL) { op->func_annotations = PyDict_New(); @@ -387,7 +387,7 @@ func_get_annotations(PyFunctionObject *op) } static int -func_set_annotations(PyFunctionObject *op, PyObject *value) +func_set_annotations(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored)) { if (value == Py_None) value = NULL; diff --git a/Objects/genobject.c b/Objects/genobject.c index 793a809b84..b0e877072c 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -644,14 +644,14 @@ gen_repr(PyGenObject *gen) } static PyObject * -gen_get_name(PyGenObject *op) +gen_get_name(PyGenObject *op, void *Py_UNUSED(ignored)) { Py_INCREF(op->gi_name); return op->gi_name; } static int -gen_set_name(PyGenObject *op, PyObject *value) +gen_set_name(PyGenObject *op, PyObject *value, void *Py_UNUSED(ignored)) { /* Not legal to del gen.gi_name or to set it to anything * other than a string object. */ @@ -666,14 +666,14 @@ gen_set_name(PyGenObject *op, PyObject *value) } static PyObject * -gen_get_qualname(PyGenObject *op) +gen_get_qualname(PyGenObject *op, void *Py_UNUSED(ignored)) { Py_INCREF(op->gi_qualname); return op->gi_qualname; } static int -gen_set_qualname(PyGenObject *op, PyObject *value) +gen_set_qualname(PyGenObject *op, PyObject *value, void *Py_UNUSED(ignored)) { /* Not legal to del gen.__qualname__ or to set it to anything * other than a string object. */ @@ -688,7 +688,7 @@ gen_set_qualname(PyGenObject *op, PyObject *value) } static PyObject * -gen_getyieldfrom(PyGenObject *gen) +gen_getyieldfrom(PyGenObject *gen, void *Py_UNUSED(ignored)) { PyObject *yf = _PyGen_yf(gen); if (yf == NULL) @@ -927,7 +927,7 @@ coro_await(PyCoroObject *coro) } static PyObject * -coro_get_cr_await(PyCoroObject *coro) +coro_get_cr_await(PyCoroObject *coro, void *Py_UNUSED(ignored)) { PyObject *yf = _PyGen_yf((PyGenObject *) coro); if (yf == NULL) diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c index ccf45ffc58..ce8fa3f270 100644 --- a/Objects/memoryobject.c +++ b/Objects/memoryobject.c @@ -2905,7 +2905,7 @@ _IntTupleFromSsizet(int len, Py_ssize_t *vals) } static PyObject * -memory_obj_get(PyMemoryViewObject *self) +memory_obj_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { Py_buffer *view = &self->view; @@ -2918,56 +2918,56 @@ memory_obj_get(PyMemoryViewObject *self) } static PyObject * -memory_nbytes_get(PyMemoryViewObject *self) +memory_nbytes_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return PyLong_FromSsize_t(self->view.len); } static PyObject * -memory_format_get(PyMemoryViewObject *self) +memory_format_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return PyUnicode_FromString(self->view.format); } static PyObject * -memory_itemsize_get(PyMemoryViewObject *self) +memory_itemsize_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return PyLong_FromSsize_t(self->view.itemsize); } static PyObject * -memory_shape_get(PyMemoryViewObject *self) +memory_shape_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return _IntTupleFromSsizet(self->view.ndim, self->view.shape); } static PyObject * -memory_strides_get(PyMemoryViewObject *self) +memory_strides_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return _IntTupleFromSsizet(self->view.ndim, self->view.strides); } static PyObject * -memory_suboffsets_get(PyMemoryViewObject *self) +memory_suboffsets_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return _IntTupleFromSsizet(self->view.ndim, self->view.suboffsets); } static PyObject * -memory_readonly_get(PyMemoryViewObject *self) +memory_readonly_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return PyBool_FromLong(self->view.readonly); } static PyObject * -memory_ndim_get(PyMemoryViewObject *self) +memory_ndim_get(PyMemoryViewObject *self, void *Py_UNUSED(ignored)) { CHECK_RELEASED(self); return PyLong_FromLong(self->view.ndim); |