8000 gh-111178: Fix function signatures for test_iter (#131456) · python/cpython@f5e4c29 · GitHub
[go: up one dir, main page]
Skip to content

Commit f5e4c29

Browse files
vstinnervstinner
authored
gh-111178: Fix function signatures for test_iter (#131456)
1 parent 8ad4646 commit f5e4c29

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

‎Modules/_io/bufferedio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,8 +1524,9 @@ buffered_iternext(PyObject *op)
15241524
}
15251525

15261526
static PyObject *
1527-
buffered_repr(buffered *self)
1527+
buffered_repr(PyObject *op)
15281528
{
1529+
buffered *self = buffered_CAST(op);
15291530
PyObject *nameobj, *res;
15301531

15311532
if (PyObject_GetOptionalAttr((PyObject *) self, &_Py_ID(name), &nameobj) < 0) {

‎Modules/_sre/sre.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2710,8 +2710,9 @@ match_regs_get(PyObject *op, void *Py_UNUSED(ignored))
27102710
}
27112711

27122712
static PyObject *
2713-
match_repr(MatchObject *self)
2713+
match_repr(PyObject *op)
27142714
{
2715+
MatchObject *self = _MatchObject_CAST(op);
27152716
PyObject *result;
27162717
PyObject *group0 = match_getslice_by_index(self, 0, Py_None);
27172718
if (group0 == NULL)

‎Objects/genericaliasobject.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,9 @@ static PyNumberMethods ga_as_number = {
885885
};
886886

887887
static PyObject *
888-
ga_iternext(gaiterobject *gi) {
888+
ga_iternext(PyObject *op)
889+
{
890+
gaiterobject *gi = (gaiterobject*)op;
889891
if (gi->obj == NULL) {
890892
PyErr_SetNone(PyExc_StopIteration);
891893
return NULL;
@@ -901,21 +903,25 @@ ga_iternext(gaiterobject *gi) {
901903
}
902904

903905
static void
904-
ga_iter_dealloc(gaiterobject *gi) {
906+
ga_iter_dealloc(PyObject *op)
907+
{
908+
gaiterobject *gi = (gaiterobject*)op;
905909
PyObject_GC_UnTrack(gi);
906910
Py_XDECREF(gi->obj);
907911
PyObject_GC_Del(gi);
908912
}
909913

910914
static int
911-
ga_iter_traverse(gaiterobject *gi, visitproc visit, void *arg)
915+
ga_iter_traverse(PyObject *op, visitproc visit, void *arg)
912916
{
917+
gaiterobject *gi = (gaiterobject*)op;
913918
Py_VISIT(gi->obj);
914919
return 0;
915920
}
916921

917922
static int
918-
ga_iter_clear(PyObject *self) {
923+
ga_iter_clear(PyObject *self)
924+
{
919925
gaiterobject *gi = (gaiterobject *)self;
920926
Py_CLEAR(gi->obj);
921927
return 0;
@@ -949,11 +955,11 @@ PyTypeObject _Py_GenericAliasIterType = {
949955
.tp_name = "generic_alias_iterator",
950956
.tp_basicsize = sizeof(gaiterobject),
951957
.tp_iter = PyObject_SelfIter,
952-
.tp_iternext = (iternextfunc)ga_iternext,
953-
.tp_traverse = (traverseproc)ga_iter_traverse,
958+
.tp_iternext = ga_iternext,
959+
.tp_traverse = ga_iter_traverse,
954960
.tp_methods = ga_iter_methods,
955-
.tp_dealloc = (destructor)ga_iter_dealloc,
956-
.tp_clear = (inquiry)ga_iter_clear,
961+
.tp_dealloc = ga_iter_dealloc,
962+
.tp_clear = ga_iter_clear,
957963
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
958964
};
959965

‎Objects/iterobject.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ calliter_dealloc(PyObject *op)
210210
}
211211

212212
static int
213-
calliter_traverse(calliterobject *it, visitproc visit, void *arg)
213+
calliter_traverse(PyObject *op, visitproc visit, void *arg)
214214
{
215+
calliterobject *it = (calliterobject*)op;
215216
Py_VISIT(it->it_callable);
216217
Py_VISIT(it->it_sentinel);
217218
return 0;
@@ -294,7 +295,7 @@ PyTypeObject PyCallIter_Type = {
294295
0, /* tp_as_buffer */
295296
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
296297
0, /* tp_doc */
297-
(traverseproc)calliter_traverse, /* tp_traverse */
298+
calliter_traverse, /* tp_traverse */
298299
0, /* tp_clear */
299300
0, /* tp_richcompare */
300301
0, /* tp_weaklistoffset */

0 commit comments

Comments
 (0)
0