Skip to content

Commit bb78ec8

Browse files
[3.14] gh-148274: properly handle result from PyObject_VisitManagedDict (GH-148275) (#148295)
gh-148274: properly handle result from `PyObject_VisitManagedDict` (GH-148275) (cherry picked from commit ee2775c) Co-authored-by: Max Bachmann <kontakt@maxbachmann.de>
1 parent 571c337 commit bb78ec8

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
@@ -955,8 +955,7 @@ FutureObj_traverse(PyObject *op, visitproc visit, void *arg)
955955
Py_VISIT(fut->fut_cancel_msg);
956956
Py_VISIT(fut->fut_cancelled_exc);
957957
Py_VISIT(fut->fut_awaited_by);
958-
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
959-
return 0;
958+
return PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
960959
}
961960

962961
/*[clinic input]
@@ -2445,8 +2444,7 @@ TaskObj_traverse(PyObject *op, visitproc visit, void *arg)
24452444
Py_VISIT(fut->fut_cancel_msg);
24462445
Py_VISIT(fut->fut_cancelled_exc);
24472446
Py_VISIT(fut->fut_awaited_by);
2448-
PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
2449-
return 0;
2447+
return PyObject_VisitManagedDict((PyObject *)fut, visit, arg);
24502448
}
24512449

24522450
/*[clinic input]

Modules/_testcapimodule.c

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

32053205
int ManagedDict_traverse(PyObject *self, visitproc visit, void *arg) {
3206-
PyObject_VisitManagedDict(self, visit, arg);
32073206
Py_VISIT(Py_TYPE(self));
3208-
return 0;
3207+
return PyObject_VisitManagedDict(self, visit, arg);
32093208
}
32103209

32113210
int ManagedDict_clear(PyObject *self) {

Objects/typevarobject.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,7 @@ typevar_traverse(PyObject *self, visitproc visit, void *arg)
498498
Py_VISIT(tv->evaluate_constraints);
499499
Py_VISIT(tv->default_value);
500500
Py_VISIT(tv->evaluate_default);
501-
PyObject_VisitManagedDict(self, visit, arg);
502-
return 0;
501+
return PyObject_VisitManagedDict(self, visit, arg);
503502
}
504503

505504
static int
@@ -1193,8 +1192,7 @@ paramspec_traverse(PyObject *self, visitproc visit, void *arg)
11931192
Py_VISIT(ps->bound);
11941193
Py_VISIT(ps->default_value);
11951194
Py_VISIT(ps->evaluate_default);
1196-
PyObject_VisitManagedDict(self, visit, arg);
1197-
return 0;
1195+
return PyObject_VisitManagedDict(self, visit, arg);
11981196
}
11991197

12001198
static int
@@ -1690,8 +1688,7 @@ typevartuple_traverse(PyObject *self, visitproc visit, void *arg)
16901688
Py_VISIT(tvt->name);
16911689
Py_VISIT(tvt->default_value);
16921690
Py_VISIT(tvt->evaluate_default);
1693-
PyObject_VisitManagedDict(self, visit, arg);
1694-
return 0;
1691+
return PyObject_VisitManagedDict(self, visit, arg);
16951692
}
16961693

16971694
static int

0 commit comments

Comments
 (0)