Skip to content

Commit 5ceb701

Browse files
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 d4f9cf5) Co-authored-by: Serhiy Storchaka <[email protected]>
1 parent d669154 commit 5ceb701

25 files changed

+128
-122
lines changed

Modules/_asynciomodule.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ _asyncio_Future_get_loop_impl(FutureObj *self)
10941094
}
10951095

10961096
static PyObject *
1097-
FutureObj_get_blocking(FutureObj *fut)
1097+
FutureObj_get_blocking(FutureObj *fut, void *Py_UNUSED(ignored))
10981098
{
10991099
if (future_is_alive(fut) && fut->fut_blocking) {
11001100
Py_RETURN_TRUE;
@@ -1105,7 +1105,7 @@ FutureObj_get_blocking(FutureObj *fut)
11051105
}
11061106

11071107
static int
1108-
FutureObj_set_blocking(FutureObj *fut, PyObject *val)
1108+
FutureObj_set_blocking(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
11091109
{
11101110
if (future_ensure_alive(fut)) {
11111111
return -1;
@@ -1120,7 +1120,7 @@ FutureObj_set_blocking(FutureObj *fut, PyObject *val)
11201120
}
11211121

11221122
static PyObject *
1123-
FutureObj_get_log_traceback(FutureObj *fut)
1123+
FutureObj_get_log_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
11241124
{
11251125
ENSURE_FUTURE_ALIVE(fut)
11261126
if (fut->fut_log_tb) {
@@ -1132,7 +1132,7 @@ FutureObj_get_log_traceback(FutureObj *fut)
11321132
}
11331133

11341134
static int
1135-
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
1135+
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
11361136
{
11371137
int is_true = PyObject_IsTrue(val);
11381138
if (is_true < 0) {
@@ -1148,7 +1148,7 @@ FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
11481148
}
11491149

11501150
static PyObject *
1151-
FutureObj_get_loop(FutureObj *fut)
1151+
FutureObj_get_loop(FutureObj *fut, void *Py_UNUSED(ignored))
11521152
{
11531153
if (!future_is_alive(fut)) {
11541154
Py_RETURN_NONE;
@@ -1158,7 +1158,7 @@ FutureObj_get_loop(FutureObj *fut)
11581158
}
11591159

11601160
static PyObject *
1161-
FutureObj_get_callbacks(FutureObj *fut)
1161+
FutureObj_get_callbacks(FutureObj *fut, void *Py_UNUSED(ignored))
11621162
{
11631163
Py_ssize_t i;
11641164

@@ -1210,7 +1210,7 @@ FutureObj_get_callbacks(FutureObj *fut)
12101210
}
12111211

12121212
static PyObject *
1213-
FutureObj_get_result(FutureObj *fut)
1213+
FutureObj_get_result(FutureObj *fut, void *Py_UNUSED(ignored))
12141214
{
12151215
ENSURE_FUTURE_ALIVE(fut)
12161216
if (fut->fut_result == NULL) {
@@ -1221,7 +1221,7 @@ FutureObj_get_result(FutureObj *fut)
12211221
}
12221222

12231223
static PyObject *
1224-
FutureObj_get_exception(FutureObj *fut)
1224+
FutureObj_get_exception(FutureObj *fut, void *Py_UNUSED(ignored))
12251225
{
12261226
ENSURE_FUTURE_ALIVE(fut)
12271227
if (fut->fut_exception == NULL) {
@@ -1232,7 +1232,7 @@ FutureObj_get_exception(FutureObj *fut)
12321232
}
12331233

12341234
static PyObject *
1235-
FutureObj_get_source_traceback(FutureObj *fut)
1235+
FutureObj_get_source_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
12361236
{
12371237
if (!future_is_alive(fut) || fut->fut_source_tb == NULL) {
12381238
Py_RETURN_NONE;
@@ -1242,7 +1242,7 @@ FutureObj_get_source_traceback(FutureObj *fut)
12421242
}
12431243

12441244
static PyObject *
1245-
FutureObj_get_state(FutureObj *fut)
1245+
FutureObj_get_state(FutureObj *fut, void *Py_UNUSED(ignored))
12461246
{
12471247
_Py_IDENTIFIER(PENDING);
12481248
_Py_IDENTIFIER(CANCELLED);
@@ -1723,7 +1723,7 @@ TaskStepMethWrapper_traverse(TaskStepMethWrapper *o,
17231723
}
17241724

17251725
static PyObject *
1726-
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o)
1726+
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o, void *Py_UNUSED(ignored))
17271727
{
17281728
if (o->sw_task) {
17291729
Py_INCREF(o->sw_task);
@@ -1995,7 +1995,7 @@ TaskObj_traverse(TaskObj *task, visitproc visit, void *arg)
19951995
}
19961996

19971997
static PyObject *
1998-
TaskObj_get_log_destroy_pending(TaskObj *task)
1998+
TaskObj_get_log_destroy_pending(TaskObj *task, void *Py_UNUSED(ignored))
19991999
{
20002000
if (task->task_log_destroy_pending) {
20012001
Py_RETURN_TRUE;
@@ -2006,7 +2006,7 @@ TaskObj_get_log_destroy_pending(TaskObj *task)
20062006
}
20072007

20082008
static int
2009-
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
2009+
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val, void *Py_UNUSED(ignored))
20102010
{
20112011
int is_true = PyObject_IsTrue(val);
20122012
if (is_true < 0) {
@@ -2017,7 +2017,7 @@ TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
20172017
}
20182018

20192019
static PyObject *
2020-
TaskObj_get_must_cancel(TaskObj *task)
2020+
TaskObj_get_must_cancel(TaskObj *task, void *Py_UNUSED(ignored))
20212021
{
20222022
if (task->task_must_cancel) {
20232023
Py_RETURN_TRUE;
@@ -2028,7 +2028,7 @@ TaskObj_get_must_cancel(TaskObj *task)
20282028
}
20292029

20302030
static PyObject *
2031-
TaskObj_get_coro(TaskObj *task)
2031+
TaskObj_get_coro(TaskObj *task, void *Py_UNUSED(ignored))
20322032
{
20332033
if (task->task_coro) {
20342034
Py_INCREF(task->task_coro);
@@ -2039,7 +2039,7 @@ TaskObj_get_coro(TaskObj *task)
20392039
}
20402040

20412041
static PyObject *
2042-
TaskObj_get_fut_waiter(TaskObj *task)
2042+
TaskObj_get_fut_waiter(TaskObj *task, void *Py_UNUSED(ignored))
20432043
{
20442044
if (task->task_fut_waiter) {
20452045
Py_INCREF(task->task_fut_waiter);

Modules/_collectionsmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ deque_bool(dequeobject *deque)
15421542
}
15431543

15441544
static PyObject *
1545-
deque_get_maxlen(dequeobject *deque)
1545+
deque_get_maxlen(dequeobject *deque, void *Py_UNUSED(ignored))
15461546
{
15471547
if (deque->maxlen < 0)
15481548
Py_RETURN_NONE;

Modules/_csv.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,31 @@ get_nullchar_as_None(Py_UCS4 c)
159159
}
160160

161161
static PyObject *
162-
Dialect_get_lineterminator(DialectObj *self)
162+
Dialect_get_lineterminator(DialectObj *self, void *Py_UNUSED(ignored))
163163
{
164164
return get_string(self->lineterminator);
165165
}
166166

167167
static PyObject *
168-
Dialect_get_delimiter(DialectObj *self)
168+
Dialect_get_delimiter(DialectObj *self, void *Py_UNUSED(ignored))
169169
{
170170
return get_nullchar_as_None(self->delimiter);
171171
}
172172

173173
static PyObject *
174-
Dialect_get_escapechar(DialectObj *self)
174+
Dialect_get_escapechar(DialectObj *self, void *Py_UNUSED(ignored))
175175
{
176176
return get_nullchar_as_None(self->escapechar);
177177
}
178178

179179
static PyObject *
180-
Dialect_get_quotechar(DialectObj *self)
180+
Dialect_get_quotechar(DialectObj *self, void *Py_UNUSED(ignored))
181181
{
182182
return get_nullchar_as_None(self->quotechar);
183183
}
184184

185185
static PyObject *
186-
Dialect_get_quoting(DialectObj *self)
186+
Dialect_get_quoting(DialectObj *self, void *Py_UNUSED(ignored))
187187
{
188188
return PyLong_FromLong(self->quoting);
189189
}

Modules/_ctypes/_ctypes.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ PyTypeObject PyCPointerType_Type = {
11611161
*/
11621162

11631163
static int
1164-
CharArray_set_raw(CDataObject *self, PyObject *value)
1164+
CharArray_set_raw(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
11651165
{
11661166
char *ptr;
11671167
Py_ssize_t size;
@@ -1187,13 +1187,13 @@ CharArray_set_raw(CDataObject *self, PyObject *value)
11871187
}
11881188

11891189
static PyObject *
1190-
CharArray_get_raw(CDataObject *self)
1190+
CharArray_get_raw(CDataObject *self, void *Py_UNUSED(ignored))
11911191
{
11921192
return PyBytes_FromStringAndSize(self->b_ptr, self->b_size);
11931193
}
11941194

11951195
static PyObject *
1196-
CharArray_get_value(CDataObject *self)
1196+
CharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
11971197
{
11981198
Py_ssize_t i;
11991199
char *ptr = self->b_ptr;
@@ -1204,7 +1204,7 @@ CharArray_get_value(CDataObject *self)
12041204
}
12051205

12061206
static int
1207-
CharArray_set_value(CDataObject *self, PyObject *value)
1207+
CharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
12081208
{
12091209
char *ptr;
12101210
Py_ssize_t size;
@@ -1249,7 +1249,7 @@ static PyGetSetDef CharArray_getsets[] = {
12491249

12501250
#ifdef CTYPES_UNICODE
12511251
static PyObject *
1252-
WCharArray_get_value(CDataObject *self)
1252+
WCharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
12531253
{
12541254
Py_ssize_t i;
12551255
wchar_t *ptr = (wchar_t *)self->b_ptr;
@@ -1260,7 +1260,7 @@ WCharArray_get_value(CDataObject *self)
12601260
}
12611261

12621262
static int
1263-
WCharArray_set_value(CDataObject *self, PyObject *value)
1263+
WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
12641264
{
12651265
Py_ssize_t result = 0;
12661266
Py_UNICODE *wstr;
@@ -3045,7 +3045,7 @@ GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
30453045
*/
30463046

30473047
static int
3048-
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
3048+
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30493049
{
30503050
if (ob && !PyCallable_Check(ob)) {
30513051
PyErr_SetString(PyExc_TypeError,
@@ -3058,7 +3058,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
30583058
}
30593059

30603060
static PyObject *
3061-
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
3061+
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
30623062
{
30633063
if (self->errcheck) {
30643064
Py_INCREF(self->errcheck);
@@ -3068,7 +3068,7 @@ PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
30683068
}
30693069

30703070
static int
3071-
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
3071+
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30723072
{
30733073
if (ob == NULL) {
30743074
Py_CLEAR(self->restype);
@@ -3089,7 +3089,7 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
30893089
}
30903090

30913091
static PyObject *
3092-
PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
3092+
PyCFuncPtr_get_restype(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
30933093
{
30943094
StgDictObject *dict;
30953095
if (self->restype) {
@@ -3107,7 +3107,7 @@ PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
31073107
}
31083108

31093109
static int
3110-
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
3110+
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
31113111
{
31123112
PyObject *converters;
31133113

@@ -3126,7 +3126,7 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
31263126
}
31273127

31283128
static PyObject *
3129-
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self)
3129+
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
31303130
{
31313131
StgDictObject *dict;
31323132
if (self->argtypes) {
@@ -4670,7 +4670,7 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
46704670
*/
46714671

46724672
static int
4673-
Simple_set_value(CDataObject *self, PyObject *value)
4673+
Simple_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
46744674
{
46754675
PyObject *result;
46764676
StgDictObject *dict = PyObject_stgdict((PyObject *)self);
@@ -4697,12 +4697,12 @@ Simple_init(CDataObject *self, PyObject *args, PyObject *kw)
46974697
if (!PyArg_UnpackTuple(args, "__init__", 0, 1, &value))
46984698
return -1;
46994699
if (value)
4700-
return Simple_set_value(self, value);
4700+
return Simple_set_value(self, value, NULL);
47014701
return 0;
47024702
}
47034703

47044704
static PyObject *
4705-
Simple_get_value(CDataObject *self)
4705+
Simple_get_value(CDataObject *self, void *Py_UNUSED(ignored))
47064706
{
47074707
StgDictObject *dict;
47084708
dict = PyObject_stgdict((PyObject *)self);
@@ -4725,7 +4725,7 @@ Simple_from_outparm(PyObject *self, PyObject *args)
47254725
return self;
47264726
}
47274727
/* call stgdict->getfunc */
4728-
return Simple_get_value((CDataObject *)self);
4728+
return Simple_get_value((CDataObject *)self, NULL);
47294729
}
47304730

47314731
static PyMethodDef Simple_methods[] = {
@@ -4762,7 +4762,7 @@ Simple_repr(CDataObject *self)
47624762
Py_TYPE(self)->tp_name, self);
47634763
}
47644764

4765-
val = Simple_get_value(self);
4765+
val = Simple_get_value(self, NULL);
47664766
if (val == NULL)
47674767
return NULL;
47684768

Modules/_cursesmodule.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ PyCursesWindow_get_encoding(PyCursesWindowObject *self, void *closure)
19601960
}
19611961

19621962
static int
1963-
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value)
1963+
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value, void *Py_UNUSED(ignored))
19641964
{
19651965
PyObject *ascii;
19661966
char *encoding;

Modules/_io/bytesio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
201201
}
202202

203203
static PyObject *
204-
bytesio_get_closed(bytesio *self)
204+
bytesio_get_closed(bytesio *self, void *Py_UNUSED(ignored))
205205
{
206206
if (self->buf == NULL) {
207207
Py_RETURN_TRUE;

0 commit comments

Comments
 (0)