Skip to content

Commit 29d2f3c

Browse files
serhiy-storchakaserhiy-storchaka
authored
[3.6] bpo-33029: Fix signatures of getter and setter functions. (GH-10746) (GH-10749)
Fix also return type for few other functions (clear, releasebuffer). (cherry picked from commit d4f9cf5)
1 parent 54fa83e commit 29d2f3c

23 files changed

+125
-119
lines changed

‎Modules/_asynciomodule.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ _asyncio_Future_done_impl(FutureObj *self)
625625
}
626626

627627
static PyObject *
628-
FutureObj_get_blocking(FutureObj *fut)
628+
FutureObj_get_blocking(FutureObj *fut, void *Py_UNUSED(ignored))
629629
{
630630
if (fut->fut_blocking) {
631631
Py_RETURN_TRUE;
@@ -636,7 +636,7 @@ FutureObj_get_blocking(FutureObj *fut)
636636
}
637637

638638
static int
639-
FutureObj_set_blocking(FutureObj *fut, PyObject *val)
639+
FutureObj_set_blocking(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
640640
{
641641
int is_true = PyObject_IsTrue(val);
642642
if (is_true < 0) {
@@ -647,7 +647,7 @@ FutureObj_set_blocking(FutureObj *fut, PyObject *val)
647647
}
648648

649649
static PyObject *
650-
FutureObj_get_log_traceback(FutureObj *fut)
650+
FutureObj_get_log_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
651651
{
652652
if (fut->fut_log_tb) {
653653
Py_RETURN_TRUE;
@@ -658,7 +658,7 @@ FutureObj_get_log_traceback(FutureObj *fut)
658658
}
659659

660660
static int
661-
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
661+
FutureObj_set_log_traceback(FutureObj *fut, PyObject *val, void *Py_UNUSED(ignored))
662662
{
663663
int is_true = PyObject_IsTrue(val);
664664
if (is_true < 0) {
@@ -669,7 +669,7 @@ FutureObj_set_log_traceback(FutureObj *fut, PyObject *val)
669669
}
670670

671671
static PyObject *
672-
FutureObj_get_loop(FutureObj *fut)
672+
FutureObj_get_loop(FutureObj *fut, void *Py_UNUSED(ignored))
673673
{
674674
if (fut->fut_loop == NULL) {
675675
Py_RETURN_NONE;
@@ -679,7 +679,7 @@ FutureObj_get_loop(FutureObj *fut)
679679
}
680680

681681
static PyObject *
682-
FutureObj_get_callbacks(FutureObj *fut)
682+
FutureObj_get_callbacks(FutureObj *fut, void *Py_UNUSED(ignored))
683683
{
684684
if (fut->fut_callbacks == NULL) {
685685
Py_RETURN_NONE;
@@ -689,7 +689,7 @@ FutureObj_get_callbacks(FutureObj *fut)
689689
}
690690

691691
static PyObject *
692-
FutureObj_get_result(FutureObj *fut)
692+
FutureObj_get_result(FutureObj *fut, void *Py_UNUSED(ignored))
693693
{
694694
if (fut->fut_result == NULL) {
695695
Py_RETURN_NONE;
@@ -699,7 +699,7 @@ FutureObj_get_result(FutureObj *fut)
699699
}
700700

701701
static PyObject *
702-
FutureObj_get_exception(FutureObj *fut)
702+
FutureObj_get_exception(FutureObj *fut, void *Py_UNUSED(ignored))
703703
{
704704
if (fut->fut_exception == NULL) {
705705
Py_RETURN_NONE;
@@ -709,7 +709,7 @@ FutureObj_get_exception(FutureObj *fut)
709709
}
710710

711711
static PyObject *
712-
FutureObj_get_source_traceback(FutureObj *fut)
712+
FutureObj_get_source_traceback(FutureObj *fut, void *Py_UNUSED(ignored))
713713
{
714714
if (fut->fut_source_tb == NULL) {
715715
Py_RETURN_NONE;
@@ -719,7 +719,7 @@ FutureObj_get_source_traceback(FutureObj *fut)
719719
}
720720

721721
static PyObject *
722-
FutureObj_get_state(FutureObj *fut)
722+
FutureObj_get_state(FutureObj *fut, void *Py_UNUSED(ignored))
723723
{
724724
_Py_IDENTIFIER(PENDING);
725725
_Py_IDENTIFIER(CANCELLED);
@@ -1207,7 +1207,7 @@ TaskStepMethWrapper_traverse(TaskStepMethWrapper *o,
12071207
}
12081208

12091209
static PyObject *
1210-
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o)
1210+
TaskStepMethWrapper_get___self__(TaskStepMethWrapper *o, void *Py_UNUSED(ignored))
12111211
{
12121212
if (o->sw_task) {
12131213
Py_INCREF(o->sw_task);
@@ -1387,7 +1387,7 @@ TaskObj_traverse(TaskObj *task, visitproc visit, void *arg)
13871387
}
13881388

13891389
static PyObject *
1390-
TaskObj_get_log_destroy_pending(TaskObj *task)
1390+
TaskObj_get_log_destroy_pending(TaskObj *task, void *Py_UNUSED(ignored))
13911391
{
13921392
if (task->task_log_destroy_pending) {
13931393
Py_RETURN_TRUE;
@@ -1398,7 +1398,7 @@ TaskObj_get_log_destroy_pending(TaskObj *task)
13981398
}
13991399

14001400
static int
1401-
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
1401+
TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val, void *Py_UNUSED(ignored))
14021402
{
14031403
int is_true = PyObject_IsTrue(val);
14041404
if (is_true < 0) {
@@ -1409,7 +1409,7 @@ TaskObj_set_log_destroy_pending(TaskObj *task, PyObject *val)
14091409
}
14101410

14111411
static PyObject *
1412-
TaskObj_get_must_cancel(TaskObj *task)
1412+
TaskObj_get_must_cancel(TaskObj *task, void *Py_UNUSED(ignored))
14131413
{
14141414
if (task->task_must_cancel) {
14151415
Py_RETURN_TRUE;
@@ -1420,7 +1420,7 @@ TaskObj_get_must_cancel(TaskObj *task)
14201420
}
14211421

14221422
static PyObject *
1423-
TaskObj_get_coro(TaskObj *task)
1423+
TaskObj_get_coro(TaskObj *task, void *Py_UNUSED(ignored))
14241424
{
14251425
if (task->task_coro) {
14261426
Py_INCREF(task->task_coro);
@@ -1431,7 +1431,7 @@ TaskObj_get_coro(TaskObj *task)
14311431
}
14321432

14331433
static PyObject *
1434-
TaskObj_get_fut_waiter(TaskObj *task)
1434+
TaskObj_get_fut_waiter(TaskObj *task, void *Py_UNUSED(ignored))
14351435
{
14361436
if (task->task_fut_waiter) {
14371437
Py_INCREF(task->task_fut_waiter);

‎Modules/_collectionsmodule.c

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

15411541
static PyObject *
1542-
deque_get_maxlen(dequeobject *deque)
1542+
deque_get_maxlen(dequeobject *deque, void *Py_UNUSED(ignored))
15431543
{
15441544
if (deque->maxlen < 0)
15451545
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
@@ -1163,7 +1163,7 @@ PyTypeObject PyCPointerType_Type = {
11631163
*/
11641164

11651165
static int
1166-
CharArray_set_raw(CDataObject *self, PyObject *value)
1166+
CharArray_set_raw(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
11671167
{
11681168
char *ptr;
11691169
Py_ssize_t size;
@@ -1189,13 +1189,13 @@ CharArray_set_raw(CDataObject *self, PyObject *value)
11891189
}
11901190

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

11971197
static PyObject *
1198-
CharArray_get_value(CDataObject *self)
1198+
CharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
11991199
{
12001200
Py_ssize_t i;
12011201
char *ptr = self->b_ptr;
@@ -1206,7 +1206,7 @@ CharArray_get_value(CDataObject *self)
12061206
}
12071207

12081208
static int
1209-
CharArray_set_value(CDataObject *self, PyObject *value)
1209+
CharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
12101210
{
12111211
char *ptr;
12121212
Py_ssize_t size;
@@ -1251,7 +1251,7 @@ static PyGetSetDef CharArray_getsets[] = {
12511251

12521252
#ifdef CTYPES_UNICODE
12531253
static PyObject *
1254-
WCharArray_get_value(CDataObject *self)
1254+
WCharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
12551255
{
12561256
Py_ssize_t i;
12571257
wchar_t *ptr = (wchar_t *)self->b_ptr;
@@ -1262,7 +1262,7 @@ WCharArray_get_value(CDataObject *self)
12621262
}
12631263

12641264
static int
1265-
WCharArray_set_value(CDataObject *self, PyObject *value)
1265+
WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
12661266
{
12671267
Py_ssize_t result = 0;
12681268
Py_UNICODE *wstr;
@@ -3049,7 +3049,7 @@ GenericPyCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
30493049
*/
30503050

30513051
static int
3052-
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
3052+
PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30533053
{
30543054
if (ob && !PyCallable_Check(ob)) {
30553055
PyErr_SetString(PyExc_TypeError,
@@ -3062,7 +3062,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
30623062
}
30633063

30643064
static PyObject *
3065-
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
3065+
PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
30663066
{
30673067
if (self->errcheck) {
30683068
Py_INCREF(self->errcheck);
@@ -3073,7 +3073,7 @@ PyCFuncPtr_get_errcheck(PyCFuncPtrObject *self)
30733073
}
30743074

30753075
static int
3076-
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
3076+
PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
30773077
{
30783078
if (ob == NULL) {
30793079
Py_CLEAR(self->restype);
@@ -3094,7 +3094,7 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
30943094
}
30953095

30963096
static PyObject *
3097-
PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
3097+
PyCFuncPtr_get_restype(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
30983098
{
30993099
StgDictObject *dict;
31003100
if (self->restype) {
@@ -3113,7 +3113,7 @@ PyCFuncPtr_get_restype(PyCFuncPtrObject *self)
31133113
}
31143114

31153115
static int
3116-
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
3116+
PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob, void *Py_UNUSED(ignored))
31173117
{
31183118
PyObject *converters;
31193119

@@ -3132,7 +3132,7 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
31323132
}
31333133

31343134
static PyObject *
3135-
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self)
3135+
PyCFuncPtr_get_argtypes(PyCFuncPtrObject *self, void *Py_UNUSED(ignored))
31363136
{
31373137
StgDictObject *dict;
31383138
if (self->argtypes) {
@@ -4678,7 +4678,7 @@ PyCArrayType_from_ctype(PyObject *itemtype, Py_ssize_t length)
46784678
*/
46794679

46804680
static int
4681-
Simple_set_value(CDataObject *self, PyObject *value)
4681+
Simple_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
46824682
{
46834683
PyObject *result;
46844684
StgDictObject *dict = PyObject_stgdict((PyObject *)self);
@@ -4705,12 +4705,12 @@ Simple_init(CDataObject *self, PyObject *args, PyObject *kw)
47054705
if (!PyArg_UnpackTuple(args, "__init__", 0, 1, &value))
47064706
return -1;
47074707
if (value)
4708-
return Simple_set_value(self, value);
4708+
return Simple_set_value(self, value, NULL);
47094709
return 0;
47104710
}
47114711

47124712
static PyObject *
4713-
Simple_get_value(CDataObject *self)
4713+
Simple_get_value(CDataObject *self, void *Py_UNUSED(ignored))
47144714
{
47154715
StgDictObject *dict;
47164716
dict = PyObject_stgdict((PyObject *)self);
@@ -4733,7 +4733,7 @@ Simple_from_outparm(PyObject *self, PyObject *args)
47334733
return self;
47344734
}
47354735
/* call stgdict->getfunc */
4736-
return Simple_get_value((CDataObject *)self);
4736+
return Simple_get_value((CDataObject *)self, NULL);
47374737
}
47384738

47394739
static PyMethodDef Simple_methods[] = {
@@ -4770,7 +4770,7 @@ Simple_repr(CDataObject *self)
47704770
Py_TYPE(self)->tp_name, self);
47714771
}
47724772

4773-
val = Simple_get_value(self);
4773+
val = Simple_get_value(self, NULL);
47744774
if (val == NULL)
47754775
return NULL;
47764776

‎Modules/_cursesmodule.c

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

19781978
static int
1979-
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value)
1979+
PyCursesWindow_set_encoding(PyCursesWindowObject *self, PyObject *value, void *Py_UNUSED(ignored))
19801980
{
19811981
PyObject *ascii;
19821982
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)