X Tutup
Skip to content

Commit d4f9cf5

Browse files
serhiy-storchakaserhiy-storchaka
authored
bpo-33029: Fix signatures of getter and setter functions. (pythonGH-10746)
Fix also return type for few other functions (clear, releasebuffer).
1 parent 1005c84 commit d4f9cf5

25 files changed

+128
-122
lines changed

‎Modules/_asynciomodule.c‎

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

10991099
static PyObject *
1100-
FutureObj_get_blocking(FutureObj *fut)
1100+
FutureObj_get_blocking(FutureObj *fut, void *Py_UNUSED(ignored))
11011101
{
11021102
if (future_is_alive(fut) && fut->fut_blocking) {
11031103
Py_RETURN_TRUE;
@@ -1108,7 +1108,7 @@ FutureObj_get_blocking(FutureObj *fut)
11081108
}
11091109

11101110
static int
1111-
FutureObj_set_blocking(FutureObj *fut, PyObject *val)
1111+
FutureObj_set_blocking(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
11121112
{
11131113
if (future_ensure_alive(fut)) {
11141114
return -1;
@@ -1123,7 +1123,7 @@ FutureObj_set_blocking(FutureObj *fut, PyObject *val)
11231123
}
11241124

11251125
static PyObject *
1126-
FutureObj_get_log_traceback(FutureObj *fut)
1126+
FutureObj_get_log_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
11271127
{
11281128
ENSURE_FUTURE_ALIVE(fut)
11291129
if (fut->fut_log_tb) {
@@ -1135,7 +1135,7 @@ FutureObj_get_log_traceback(FutureObj *fut)
11351135
}
11361136

11371137
static int
1138-
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
1138+
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
11391139
{
11401140
int is_true = PyObject_IsTrue(val);
11411141
if (is_true < 0) {
@@ -1151,7 +1151,7 @@ FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
11511151
}
11521152

11531153
static PyObject *
1154-
FutureObj_get_loop(FutureObj *fut)
1154+
FutureObj_get_loop(FutureObj *fut, void *Py_UNUSED(ignored))
11551155
{
11561156
if (!future_is_alive(fut)) {
11571157
Py_RETURN_NONE;
@@ -1161,7 +1161,7 @@ FutureObj_get_loop(FutureObj *fut)
11611161
}
11621162

11631163
static PyObject *
1164-
FutureObj_get_callbacks(FutureObj *fut)
1164+
FutureObj_get_callbacks(FutureObj *fut, void *Py_UNUSED(ignored))
11651165
{
11661166
Py_ssize_t i;
11671167

@@ -1213,7 +1213,7 @@ FutureObj_get_callbacks(FutureObj *fut)
12131213
}
12141214

12151215
static PyObject *
1216-
FutureObj_get_result(FutureObj *fut)
1216+
FutureObj_get_result(FutureObj *fut, void *Py_UNUSED(ignored))
12171217
{
12181218
ENSURE_FUTURE_ALIVE(fut)
12191219
if (fut->fut_result == NULL) {
@@ -1224,7 +1224,7 @@ FutureObj_get_result(FutureObj *fut)
12241224
}
12251225

12261226
static PyObject *
1227-
FutureObj_get_exception(FutureObj *fut)
1227+
FutureObj_get_exception(FutureObj *fut, void *Py_UNUSED(ignored))
12281228
{
12291229
ENSURE_FUTURE_ALIVE(fut)
12301230
if (fut->fut_exception == NULL) {
@@ -1235,7 +1235,7 @@ FutureObj_get_exception(FutureObj *fut)
12351235
}
12361236

12371237
static PyObject *
1238-
FutureObj_get_source_traceback(FutureObj *fut)
1238+
FutureObj_get_source_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
12391239
{
12401240
if (!future_is_alive(fut) || fut->fut_source_tb == NULL) {
12411241
Py_RETURN_NONE;
@@ -1245,7 +1245,7 @@ FutureObj_get_source_traceback(FutureObj *fut)
12451245
}
12461246

12471247
static PyObject *
1248-
FutureObj_get_state(FutureObj *fut)
1248+
FutureObj_get_state(FutureObj *fut, void *Py_UNUSED(ignored))
12491249
{
12501250
_Py_IDENTIFIER(PENDING);
12511251
_Py_IDENTIFIER(CANCELLED);
@@ -1714,7 +1714,7 @@ TaskStepMethWrapper_traverse(TaskStepMethWrapper *o,
17141714
}
17151715

17161716
static PyObject *
1717-
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o)
1717+
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o, void *Py_UNUSED(ignored))
17181718
{
17191719
if (o->sw_task) {
17201720
Py_INCREF(o->sw_task);
@@ -2002,7 +2002,7 @@ TaskObj_traverse(TaskObj *task, visitproc visit, void *arg)
20022002
}
20032003

20042004
static PyObject *
2005-
TaskObj_get_log_destroy_pending(TaskObj *task)
2005+
TaskObj_get_log_destroy_pending(TaskObj *task, void *Py_UNUSED(ignored))
20062006
{
20072007
if (task->task_log_destroy_pending) {
20082008
Py_RETURN_TRUE;
@@ -2013,7 +2013,7 @@ TaskObj_get_log_destroy_pending(TaskObj *task)
20132013
}
20142014

20152015
static int
2016-
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
2016+
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val, void *Py_UNUSED(ignored))
20172017
{
20182018
int is_true = PyObject_IsTrue(val);
20192019
if (is_true < 0) {
@@ -2024,7 +2024,7 @@ TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
20242024
}
20252025

20262026
static PyObject *
2027-
TaskObj_get_must_cancel(TaskObj *task)
2027+
TaskObj_get_must_cancel(TaskObj *task, void *Py_UNUSED(ignored))
20282028
{
20292029
if (task->task_must_cancel) {
20302030
Py_RETURN_TRUE;
@@ -2035,7 +2035,7 @@ TaskObj_get_must_cancel(TaskObj *task)
20352035
}
20362036

20372037
static PyObject *
2038-
TaskObj_get_coro(TaskObj *task)
2038+
TaskObj_get_coro(TaskObj *task, void *Py_UNUSED(ignored))
20392039
{
20402040
if (task->task_coro) {
20412041
Py_INCREF(task->task_coro);
@@ -2046,7 +2046,7 @@ TaskObj_get_coro(TaskObj *task)
20462046
}
20472047

20482048
static PyObject *
2049-
TaskObj_get_fut_waiter(TaskObj *task)
2049+
TaskObj_get_fut_waiter(TaskObj *task, void *Py_UNUSED(ignored))
20502050
{
20512051
if (task->task_fut_waiter) {
20522052
Py_INCREF(task->task_fut_waiter);

‎Modules/_collectionsmodule.c‎

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

15101510
static PyObject *
1511-
deque_get_maxlen(dequeobject *deque)
1511+
deque_get_maxlen(dequeobject *deque, void *Py_UNUSED(ignored))
15121512
{
15131513
if (deque->maxlen < 0)
15141514
Py_RETURN_NONE;

‎Modules/_csv.c‎

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

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

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

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

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

186186
static PyObject *
187-
Dialect_get_quoting(DialectObj *self)
187+
Dialect_get_quoting(DialectObj *self, void *Py_UNUSED(ignored))
188188
{
189189
return PyLong_FromLong(self->quoting);
190190
}

‎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;
@@ -3060,7 +3060,7 @@ GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
30603060
*/
30613061

30623062
static int
3063-
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
3063+
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30643064
{
30653065
if (ob && !PyCallable_Check(ob)) {
30663066
PyErr_SetString(PyExc_TypeError,
@@ -3073,7 +3073,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
30733073
}
30743074

30753075
static PyObject *
3076-
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
3076+
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
30773077
{
30783078
if (self->errcheck) {
30793079
Py_INCREF(self->errcheck);
@@ -3083,7 +3083,7 @@ PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
30833083
}
30843084

30853085
static int
3086-
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
3086+
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30873087
{
30883088
if (ob == NULL) {
30893089
Py_CLEAR(self->restype);
@@ -3104,7 +3104,7 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
31043104
}
31053105

31063106
static PyObject *
3107-
PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
3107+
PyCFuncPtr_get_restype(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
31083108
{
31093109
StgDictObject *dict;
31103110
if (self->restype) {
@@ -3122,7 +3122,7 @@ PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
31223122
}
31233123

31243124
static int
3125-
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
3125+
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
31263126
{
31273127
PyObject *converters;
31283128

@@ -3141,7 +3141,7 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
31413141
}
31423142

31433143
static PyObject *
3144-
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self)
3144+
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
31453145
{
31463146
StgDictObject *dict;
31473147
if (self->argtypes) {
@@ -4685,7 +4685,7 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
46854685
*/
46864686

46874687
static int
4688-
Simple_set_value(CDataObject *self, PyObject *value)
4688+
Simple_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
46894689
{
46904690
PyObject *result;
46914691
StgDictObject *dict = PyObject_stgdict((PyObject *)self);
@@ -4712,12 +4712,12 @@ Simple_init(CDataObject *self, PyObject *args, PyObject *kw)
47124712
if (!PyArg_UnpackTuple(args, "__init__", 0, 1, &value))
47134713
return -1;
47144714
if (value)
4715-
return Simple_set_value(self, value);
4715+
return Simple_set_value(self, value, NULL);
47164716
return 0;
47174717
}
47184718

47194719
static PyObject *
4720-
Simple_get_value(CDataObject *self)
4720+
Simple_get_value(CDataObject *self, void *Py_UNUSED(ignored))
47214721
{
47224722
StgDictObject *dict;
47234723
dict = PyObject_stgdict((PyObject *)self);
@@ -4740,7 +4740,7 @@ Simple_from_outparm(PyObject *self, PyObject *args)
47404740
return self;
47414741
}
47424742
/* call stgdict->getfunc */
4743-
return Simple_get_value((CDataObject *)self);
4743+
return Simple_get_value((CDataObject *)self, NULL);
47444744
}
47454745

47464746
static PyMethodDef Simple_methods[] = {
@@ -4777,7 +4777,7 @@ Simple_repr(CDataObject *self)
47774777
Py_TYPE(self)->tp_name, self);
47784778
}
47794779

4780-
val = Simple_get_value(self);
4780+
val = Simple_get_value(self, NULL);
47814781
if (val == NULL)
47824782
return NULL;
47834783

‎Modules/_cursesmodule.c‎

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

22902290
static int
2291-
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value)
2291+
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value, void *Py_UNUSED(ignored))
22922292
{
22932293
PyObject *ascii;
22942294
char *encoding;

‎Modules/_io/bytesio.c‎

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

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

0 commit comments

Comments
 (0)
X Tutup