Merge branch 'devel'2_5

1 files changed, 4 insertions, 39 deletions

diff --git a/psycopg/adapter_datetime.c b/psycopg/adapter_datetime.c
index bf31cfa..67697fb 100644
--- a/psycopg/adapter_datetime.c
+++ b/psycopg/adapter_datetime.c
@@ -183,15 +183,6 @@ pydatetime_setup(pydatetimeObject *self, PyObject *obj, int type)
     return 0;
 }
 
-static int
-pydatetime_traverse(PyObject *obj, visitproc visit, void *arg)
-{
-    pydatetimeObject *self = (pydatetimeObject *)obj;
-
-    Py_VISIT(self->wrapped);
-    return 0;
-}
-
 static void
 pydatetime_dealloc(PyObject* obj)
 {
@@ -223,12 +214,6 @@ pydatetime_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     return type->tp_alloc(type, 0);
 }
 
-static void
-pydatetime_del(PyObject* self)
-{
-    PyObject_GC_Del(self);
-}
-
 static PyObject *
 pydatetime_repr(pydatetimeObject *self)
 {
@@ -244,61 +229,41 @@ pydatetime_repr(pydatetimeObject *self)
 PyTypeObject pydatetimeType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "psycopg2._psycopg.datetime",
-    sizeof(pydatetimeObject),
-    0,
+    sizeof(pydatetimeObject), 0,
     pydatetime_dealloc, /*tp_dealloc*/
     0,          /*tp_print*/
     0,          /*tp_getattr*/
     0,          /*tp_setattr*/
-
     0,          /*tp_compare*/
     (reprfunc)pydatetime_repr, /*tp_repr*/
     0,          /*tp_as_number*/
     0,          /*tp_as_sequence*/
     0,          /*tp_as_mapping*/
     0,          /*tp_hash */
-
     0,          /*tp_call*/
     (reprfunc)pydatetime_str, /*tp_str*/
     0,          /*tp_getattro*/
     0,          /*tp_setattro*/
     0,          /*tp_as_buffer*/
-
-    Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-
+    Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
     pydatetimeType_doc, /*tp_doc*/
-
-    pydatetime_traverse, /*tp_traverse*/
+    0,          /*tp_traverse*/
     0,          /*tp_clear*/
-
     0,          /*tp_richcompare*/
     0,          /*tp_weaklistoffset*/
-
     0,          /*tp_iter*/
     0,          /*tp_iternext*/
-
-    /* Attribute descriptor and subclassing stuff */
-
     pydatetimeObject_methods, /*tp_methods*/
     pydatetimeObject_members, /*tp_members*/
     0,          /*tp_getset*/
     0,          /*tp_base*/
     0,          /*tp_dict*/
-
     0,          /*tp_descr_get*/
     0,          /*tp_descr_set*/
     0,          /*tp_dictoffset*/
-
     pydatetime_init, /*tp_init*/
-    0, /*tp_alloc  will be set to PyType_GenericAlloc in module init*/
+    0,          /*tp_alloc*/
     pydatetime_new, /*tp_new*/
-    (freefunc)pydatetime_del, /*tp_free  Low-level free-memory routine */
-    0,          /*tp_is_gc For PyObject_IS_GC */
-    0,          /*tp_bases*/
-    0,          /*tp_mro method resolution order */
-    0,          /*tp_cache*/
-    0,          /*tp_subclasses*/
-    0           /*tp_weaklist*/
 };