Skip to content

Commit ee2775c

Browse files
authored
gh-148274: properly handle result from PyObject_VisitManagedDict (#148275)
1 parent 8c52450 commit ee2775c

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

Modules/_asynciomodule.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,7 @@ FutureObj_traverse(PyObject *op, visitproc visit, void *arg)
944944
Py_VISIT(fut->fut_cancel_msg);
945945
Py_VISIT(fut->fut_cancelled_exc);
946946
Py_VISIT(fut->fut_awaited_by);
947-
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
948-
return 0;
947+
return PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
949948
}
950949

951950
/*[clinic input]
@@ -2425,8 +2424,7 @@ TaskObj_traverse(PyObject *op, visitproc visit, void *arg)
24252424
Py_VISIT(fut->fut_cancel_msg);
24262425
Py_VISIT(fut->fut_cancelled_exc);
24272426
Py_VISIT(fut->fut_awaited_by);
2428-
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
2429-
return 0;
2427+
return PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
24302428
}
24312429

24322430
/*[clinic input]

Modules/_testcapimodule.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,9 +3280,8 @@ typedef struct {
32803280
} ManagedDictObject;
32813281

32823282
int ManagedDict_traverse(PyObject *self, visitproc visit, void *arg) {
3283-
PyObject_VisitManagedDict(self, visit, arg);
32843283
Py_VISIT(Py_TYPE(self));
3285-
return 0;
3284+
return PyObject_VisitManagedDict(self, visit, arg);
32863285
}
32873286

32883287
int ManagedDict_clear(PyObject *self) {

Objects/typevarobject.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,7 @@ typevar_traverse(PyObject *self, visitproc visit, void *arg)
500500
Py_VISIT(tv->evaluate_constraints);
501501
Py_VISIT(tv->default_value);
502502
Py_VISIT(tv->evaluate_default);
503-
PyObject_VisitManagedDict(self, visit, arg);
504-
return 0;
503+
return PyObject_VisitManagedDict(self, visit, arg);
505504
}
506505

507506
static int
@@ -1195,8 +1194,7 @@ paramspec_traverse(PyObject *self, visitproc visit, void *arg)
11951194
Py_VISIT(ps->bound);
11961195
Py_VISIT(ps->default_value);
11971196
Py_VISIT(ps->evaluate_default);
1198-
PyObject_VisitManagedDict(self, visit, arg);
1199-
return 0;
1197+
return PyObject_VisitManagedDict(self, visit, arg);
12001198
}
12011199

12021200
static int
@@ -1692,8 +1690,7 @@ typevartuple_traverse(PyObject *self, visitproc visit, void *arg)
16921690
Py_VISIT(tvt->name);
16931691
Py_VISIT(tvt->default_value);
16941692
Py_VISIT(tvt->evaluate_default);
1695-
PyObject_VisitManagedDict(self, visit, arg);
1696-
return 0;
1693+
return PyObject_VisitManagedDict(self, visit, arg);
16971694
}
16981695

16991696
static int

0 commit comments

Comments
 (0)