Skip to content

Commit b9751b3

Browse files
committed
Use it in _gdbm, _lzma, and _ssl.
1 parent d7a5fd8 commit b9751b3

File tree

4 files changed

+5
-39
lines changed

4 files changed

+5
-39
lines changed

Modules/_gdbmmodule.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@ newgdbmobject(_gdbm_state *state, const char *file, int flags, int mode)
122122
}
123123

124124
/* Methods */
125-
static int
126-
gdbm_traverse(PyObject *op, visitproc visit, void *arg)
127-
{
128-
Py_VISIT(Py_TYPE(op));
129-
return 0;
130-
}
131125

132126
static void
133127
gdbm_dealloc(PyObject *op)
@@ -714,7 +708,7 @@ static PyMethodDef gdbm_methods[] = {
714708

715709
static PyType_Slot gdbmtype_spec_slots[] = {
716710
{Py_tp_dealloc, gdbm_dealloc},
717-
{Py_tp_traverse, gdbm_traverse},
711+
{Py_tp_traverse, _PyObject_VisitType},
718712
{Py_tp_methods, gdbm_methods},
719713
{Py_sq_contains, gdbm_contains},
720714
{Py_mp_length, gdbm_length},

Modules/_lzmamodule.c

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -882,13 +882,6 @@ static PyMethodDef Compressor_methods[] = {
882882
{NULL}
883883
};
884884

885-
static int
886-
Compressor_traverse(PyObject *self, visitproc visit, void *arg)
887-
{
888-
Py_VISIT(Py_TYPE(self));
889-
return 0;
890-
}
891-
892885
PyDoc_STRVAR(Compressor_doc,
893886
"LZMACompressor(format=FORMAT_XZ, check=-1, preset=None, filters=None)\n"
894887
"\n"
@@ -922,7 +915,7 @@ static PyType_Slot lzma_compressor_type_slots[] = {
922915
{Py_tp_methods, Compressor_methods},
923916
{Py_tp_new, Compressor_new},
924917
{Py_tp_doc, (char *)Compressor_doc},
925-
{Py_tp_traverse, Compressor_traverse},
918+
{Py_tp_traverse, _PyObject_VisitType},
926919
{0, 0}
927920
};
928921

@@ -1328,13 +1321,6 @@ Decompressor_dealloc(PyObject *op)
13281321
Py_DECREF(tp);
13291322
}
13301323

1331-
static int
1332-
Decompressor_traverse(PyObject *self, visitproc visit, void *arg)
1333-
{
1334-
Py_VISIT(Py_TYPE(self));
1335-
return 0;
1336-
}
1337-
13381324
static PyMethodDef Decompressor_methods[] = {
13391325
_LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF
13401326
{NULL}
@@ -1369,7 +1355,7 @@ static PyType_Slot lzma_decompressor_type_slots[] = {
13691355
{Py_tp_methods, Decompressor_methods},
13701356
{Py_tp_new, _lzma_LZMADecompressor},
13711357
{Py_tp_doc, (char *)_lzma_LZMADecompressor__doc__},
1372-
{Py_tp_traverse, Decompressor_traverse},
1358+
{Py_tp_traverse, _PyObject_VisitType},
13731359
{Py_tp_members, Decompressor_members},
13741360
{0, 0}
13751361
};

Modules/_pickle.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,6 @@ typedef struct {
413413

414414
#define Pdata_CAST(op) ((Pdata *)(op))
415415

416-
static int
417-
Pdata_traverse(PyObject *self, visitproc visit, void *arg)
418-
{
419-
Py_VISIT(Py_TYPE(self));
420-
return 0;
421-
}
422-
423416
static void
424417
Pdata_dealloc(PyObject *op)
425418
{
@@ -437,7 +430,7 @@ Pdata_dealloc(PyObject *op)
437430

438431
static PyType_Slot pdata_slots[] = {
439432
{Py_tp_dealloc, Pdata_dealloc},
440-
{Py_tp_traverse, Pdata_traverse},
433+
{Py_tp_traverse, _PyObject_VisitType},
441434
{0, NULL},
442435
};
443436

Modules/_ssl.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5692,13 +5692,6 @@ _ssl_MemoryBIO_impl(PyTypeObject *type)
56925692
return (PyObject *) self;
56935693
}
56945694

5695-
static int
5696-
memory_bio_traverse(PyObject *self, visitproc visit, void *arg)
5697-
{
5698-
Py_VISIT(Py_TYPE(self));
5699-
return 0;
5700-
}
5701-
57025695
static void
57035696
memory_bio_dealloc(PyObject *op)
57045697
{
@@ -5869,7 +5862,7 @@ static PyType_Slot PySSLMemoryBIO_slots[] = {
58695862
{Py_tp_getset, memory_bio_getsetlist},
58705863
{Py_tp_new, _ssl_MemoryBIO},
58715864
{Py_tp_dealloc, memory_bio_dealloc},
5872-
{Py_tp_traverse, memory_bio_traverse},
5865+
{Py_tp_traverse, _PyObject_VisitType},
58735866
{0, 0},
58745867
};
58755868

0 commit comments

Comments
 (0)