Mercurial > cpython-lru_cache-weakref
diff Modules/itertoolsmodule.c @ 45700:7122fa65697b 2.5
Backport r61286 adding GC to the grouper for itertools.groupby() fixing Issue 2246.
| author | Raymond Hettinger <python@rcn.com> |
|---|---|
| date | Thu, 06 Mar 2008 22:58:42 +0000 |
| parents | a5234f3c7551 |
| children | 787b969d37f0 |
line wrap: on
line diff
--- a/Modules/itertoolsmodule.c Thu Mar 06 07:46:26 2008 +0000 +++ b/Modules/itertoolsmodule.c Thu Mar 06 22:58:42 2008 +0000 @@ -199,7 +199,7 @@ { _grouperobject *igo; - igo = PyObject_New(_grouperobject, &_grouper_type); + igo = PyObject_GC_New(_grouperobject, &_grouper_type); if (igo == NULL) return NULL; igo->parent = (PyObject *)parent; @@ -207,15 +207,25 @@ igo->tgtkey = tgtkey; Py_INCREF(tgtkey); + PyObject_GC_Track(igo); return (PyObject *)igo; } static void _grouper_dealloc(_grouperobject *igo) { + PyObject_GC_UnTrack(igo); Py_DECREF(igo->parent); Py_DECREF(igo->tgtkey); - PyObject_Del(igo); + PyObject_GC_Del(igo); +} + +static int +_grouper_traverse(_grouperobject *igo, visitproc visit, void *arg) +{ + Py_VISIT(igo->parent); + Py_VISIT(igo->tgtkey); + return 0; } static PyObject * @@ -282,9 +292,9 @@ PyObject_GenericGetAttr, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ 0, /* tp_doc */ - 0, /* tp_traverse */ + (traverseproc)_grouper_traverse,/* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ 0, /* tp_weaklistoffset */ @@ -301,7 +311,7 @@ 0, /* tp_init */ 0, /* tp_alloc */ 0, /* tp_new */ - PyObject_Del, /* tp_free */ + PyObject_GC_Del, /* tp_free */ };