ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

34
Modules/_ctypes/_ctypes.c
View file

@ -1161,7 +1161,7 @@ PyTypeObject PyCPointerType_Type = {
*/
static int
CharArray_set_raw(CDataObject *self, PyObject *value)
CharArray_set_raw(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
{
char *ptr;
Py_ssize_t size;
@ -1187,13 +1187,13 @@ CharArray_set_raw(CDataObject *self, PyObject *value)
}
static PyObject *
CharArray_get_raw(CDataObject *self)
CharArray_get_raw(CDataObject *self, void *Py_UNUSED(ignored))
{
return PyBytes_FromStringAndSize(self->b_ptr, self->b_size);
}
static PyObject *
CharArray_get_value(CDataObject *self)
CharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
{
Py_ssize_t i;
char *ptr = self->b_ptr;
@ -1204,7 +1204,7 @@ CharArray_get_value(CDataObject *self)
}
static int
CharArray_set_value(CDataObject *self, PyObject *value)
CharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
{
char *ptr;
Py_ssize_t size;
@ -1249,7 +1249,7 @@ static PyGetSetDef CharArray_getsets[] = {
#ifdef CTYPES_UNICODE
static PyObject *
WCharArray_get_value(CDataObject *self)
WCharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
{
Py_ssize_t i;
wchar_t *ptr = (wchar_t *)self->b_ptr;
@ -1260,7 +1260,7 @@ WCharArray_get_value(CDataObject *self)
}
static int
WCharArray_set_value(CDataObject *self, PyObject *value)
WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
{
Py_ssize_t result = 0;
Py_UNICODE *wstr;
@ -3060,7 +3060,7 @@ GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
*/
static int
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
{
if (ob && !PyCallable_Check(ob)) {
PyErr_SetString(PyExc_TypeError,
@ -3073,7 +3073,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
}
static PyObject *
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
{
if (self->errcheck) {
Py_INCREF(self->errcheck);
@ -3083,7 +3083,7 @@ PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
}
static int
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
{
if (ob == NULL) {
Py_CLEAR(self->restype);
@ -3104,7 +3104,7 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
}
static PyObject *
PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
PyCFuncPtr_get_restype(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
{
StgDictObject *dict;
if (self->restype) {
@ -3122,7 +3122,7 @@ PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
}
static int
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
{
PyObject *converters;
@ -3141,7 +3141,7 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
}
static PyObject *
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self)
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
{
StgDictObject *dict;
if (self->argtypes) {
@ -4685,7 +4685,7 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
*/
static int
Simple_set_value(CDataObject *self, PyObject *value)
Simple_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
{
PyObject *result;
StgDictObject *dict = PyObject_stgdict((PyObject *)self);
@ -4712,12 +4712,12 @@ Simple_init(CDataObject *self, PyObject *args, PyObject *kw)
if (!PyArg_UnpackTuple(args, "__init__", 0, 1, &value))
return -1;
if (value)
return Simple_set_value(self, value);
return Simple_set_value(self, value, NULL);
return 0;
}
static PyObject *
Simple_get_value(CDataObject *self)
Simple_get_value(CDataObject *self, void *Py_UNUSED(ignored))
{
StgDictObject *dict;
dict = PyObject_stgdict((PyObject *)self);
@ -4740,7 +4740,7 @@ Simple_from_outparm(PyObject *self, PyObject *args)
return self;
}
/* call stgdict->getfunc */
return Simple_get_value((CDataObject *)self);
return Simple_get_value((CDataObject *)self, NULL);
}
static PyMethodDef Simple_methods[] = {
@ -4777,7 +4777,7 @@ Simple_repr(CDataObject *self)
Py_TYPE(self)->tp_name, self);
}
val = Simple_get_value(self);
val = Simple_get_value(self, NULL);
if (val == NULL)
return NULL;