Skip to content

Commit 21b3024

Browse files
committed
Use it in array, blake2, hmac, and md5.
1 parent 55c530c commit 21b3024

File tree

4 files changed

+5
-32
lines changed

4 files changed

+5
-32
lines changed

Modules/arraymodule.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,13 +715,6 @@ ins1(arrayobject *self, Py_ssize_t where, PyObject *v)
715715

716716
/* Methods */
717717

718-
static int
719-
array_tp_traverse(PyObject *op, visitproc visit, void *arg)
720-
{
721-
Py_VISIT(Py_TYPE(op));
722-
return 0;
723-
}
724-
725718
static void
726719
array_dealloc(PyObject *op)
727720
{
@@ -2968,7 +2961,7 @@ static PyType_Slot array_slots[] = {
29682961
{Py_tp_getset, array_getsets},
29692962
{Py_tp_alloc, PyType_GenericAlloc},
29702963
{Py_tp_new, array_new},
2971-
{Py_tp_traverse, array_tp_traverse},
2964+
{Py_tp_traverse, _PyObject_VisitType},
29722965

29732966
/* as sequence */
29742967
{Py_sq_length, array_length},

Modules/blake2module.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,17 +1008,10 @@ py_blake2_dealloc(PyObject *self)
10081008
Py_DECREF(type);
10091009
}
10101010

1011-
static int
1012-
py_blake2_traverse(PyObject *self, visitproc visit, void *arg)
1013-
{
1014-
Py_VISIT(Py_TYPE(self));
1015-
return 0;
1016-
}
1017-
10181011
static PyType_Slot blake2b_type_slots[] = {
10191012
{Py_tp_clear, py_blake2_clear},
10201013
{Py_tp_dealloc, py_blake2_dealloc},
1021-
{Py_tp_traverse, py_blake2_traverse},
1014+
{Py_tp_traverse, _PyObject_VisitType},
10221015
{Py_tp_doc, (char *)py_blake2b_new__doc__},
10231016
{Py_tp_methods, py_blake2b_methods},
10241017
{Py_tp_getset, py_blake2b_getsetters},
@@ -1029,7 +1022,7 @@ static PyType_Slot blake2b_type_slots[] = {
10291022
static PyType_Slot blake2s_type_slots[] = {
10301023
{Py_tp_clear, py_blake2_clear},
10311024
{Py_tp_dealloc, py_blake2_dealloc},
1032-
{Py_tp_traverse, py_blake2_traverse},
1025+
{Py_tp_traverse, _PyObject_VisitType},
10331026
{Py_tp_doc, (char *)py_blake2s_new__doc__},
10341027
{Py_tp_methods, py_blake2b_methods},
10351028
{Py_tp_getset, py_blake2b_getsetters},

Modules/hmacmodule.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,13 +1032,6 @@ HMACObject_dealloc(PyObject *op)
10321032
Py_DECREF(type);
10331033
}
10341034

1035-
static int
1036-
HMACObject_traverse(PyObject *op, visitproc visit, void *arg)
1037-
{
1038-
Py_VISIT(Py_TYPE(op));
1039-
return 0;
1040-
}
1041-
10421035
static PyMethodDef HMACObject_methods[] = {
10431036
_HMAC_HMAC_COPY_METHODDEF
10441037
_HMAC_HMAC_UPDATE_METHODDEF
@@ -1060,7 +1053,7 @@ static PyType_Slot HMACObject_Type_slots[] = {
10601053
{Py_tp_getset, HMACObject_getsets},
10611054
{Py_tp_clear, HMACObject_clear},
10621055
{Py_tp_dealloc, HMACObject_dealloc},
1063-
{Py_tp_traverse, HMACObject_traverse},
1056+
{Py_tp_traverse, _PyObject_VisitType},
10641057
{0, NULL} /* sentinel */
10651058
};
10661059

Modules/md5module.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ newMD5object(MD5State * st)
8282
}
8383

8484
/* Internal methods for a hash object */
85-
static int
86-
MD5_traverse(PyObject *ptr, visitproc visit, void *arg)
87-
{
88-
Py_VISIT(Py_TYPE(ptr));
89-
return 0;
90-
}
9185

9286
static void
9387
MD5_dealloc(PyObject *op)
@@ -246,7 +240,7 @@ static PyType_Slot md5_type_slots[] = {
246240
{Py_tp_dealloc, MD5_dealloc},
247241
{Py_tp_methods, MD5_methods},
248242
{Py_tp_getset, MD5_getseters},
249-
{Py_tp_traverse, MD5_traverse},
243+
{Py_tp_traverse, _PyObject_VisitType},
250244
{0,0}
251245
};
252246

0 commit comments

Comments
 (0)