summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Henstridge <james@jamesh.id.au>2008-07-01 09:57:16 +0800
committerJames Henstridge <james@jamesh.id.au>2008-07-01 09:57:16 +0800
commit47d2414e3225aa5863663463cbfdb482e6820aa3 (patch)
tree4de80bd44d05957fc3b078e0e0fbdf25f78b25a9
parentfd538a8b17e741c611ac0519b2e107cc4fd39fdb (diff)
downloadpsycopg2-47d2414e3225aa5863663463cbfdb482e6820aa3.tar.gz
* psycopg/adapter_asis.c (asis_traverse): add cyclic GC traversal
for AsIs adapters.
-rw-r--r--ChangeLog3
-rw-r--r--psycopg/adapter_asis.c13
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e594ef2..f068d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-07-01 James Henstridge <james@jamesh.id.au>
+ * psycopg/adapter_asis.c (asis_traverse): add cyclic GC traversal
+ for AsIs adapters.
+
* psycopg/adapter_list.c (list_traverse): add cyclic GC traversal
for list adapters.
diff --git a/psycopg/adapter_asis.c b/psycopg/adapter_asis.c
index 0e64eb5..3fc9c56 100644
--- a/psycopg/adapter_asis.c
+++ b/psycopg/adapter_asis.c
@@ -106,6 +106,13 @@ asis_setup(asisObject *self, PyObject *obj)
return 0;
}
+static int
+asis_traverse(asisObject *self, visitproc visit, void *arg)
+{
+ Py_VISIT(self->wrapped);
+ return 0;
+}
+
static void
asis_dealloc(PyObject* obj)
{
@@ -141,7 +148,7 @@ asis_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static void
asis_del(PyObject* self)
{
- PyObject_Del(self);
+ PyObject_GC_Del(self);
}
static PyObject *
@@ -183,10 +190,10 @@ PyTypeObject asisType = {
0, /*tp_setattro*/
0, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
asisType_doc, /*tp_doc*/
- 0, /*tp_traverse*/
+ (traverseproc)asis_traverse, /*tp_traverse*/
0, /*tp_clear*/
0, /*tp_richcompare*/