summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-29 18:56:13 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-01-01 03:39:58 +0100
commit5792fa90ace06f736661d9924ec9a75c3a0a9771 (patch)
tree189f5bcd84247351d641f758cc914cf99b6af407 /lib
parentf5fe9c32ef833d3f1ee4b891f46e94382aa182fe (diff)
downloadsamba-5792fa90ace06f736661d9924ec9a75c3a0a9771.tar.gz
samba-5792fa90ace06f736661d9924ec9a75c3a0a9771.tar.bz2
samba-5792fa90ace06f736661d9924ec9a75c3a0a9771.zip
s4-python: Only set BASETYPE flag if subclassing is supported.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sat Jan 1 03:39:58 CET 2011 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/talloc/pytalloc.c4
-rw-r--r--lib/tdb/pytdb.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index a8c46c96f8..614b81f057 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -96,7 +96,7 @@ static void py_talloc_dealloc(PyObject* self)
py_talloc_Object *obj = (py_talloc_Object *)self;
assert(talloc_unlink(NULL, obj->talloc_ctx) != -1);
obj->talloc_ctx = NULL;
- PyObject_Del(self);
+ self->ob_type->tp_free(self);
}
/**
@@ -112,8 +112,6 @@ static int py_talloc_default_cmp(PyObject *_obj1, PyObject *_obj2)
return ((char *)py_talloc_get_ptr(obj1) - (char *)py_talloc_get_ptr(obj2));
}
-
-
static PyTypeObject TallocObject_Type = {
.tp_name = "talloc.Object",
.tp_doc = "Python wrapper for a talloc-maintained object.",
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 981459efef..0faba562de 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -479,7 +479,7 @@ static void tdb_object_dealloc(PyTdbObject *self)
{
if (!self->closed)
tdb_close(self->ctx);
- PyObject_Del(self);
+ self->ob_type->tp_free(self);
}
static PyObject *obj_getitem(PyTdbObject *self, PyObject *key)