From 51e5dac69a78930fb05ccd8d9cfe59b9cd51c03a Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Wed, 18 Nov 2009 22:48:34 +0000 Subject: Adapted code for supporting Python 3. git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@135 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a --- ChangeLog | 7 +++++++ plugins/pyoida/analysis/py_binary.c | 5 ++++- plugins/pyoida/analysis/py_line.c | 5 ++++- plugins/pyoida/py_log.c | 5 ++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c9ea6c..3c31400 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +09-10-31 Cyrille Bagard + + * plugins/pyoida/analysis/py_binary.c: + * plugins/pyoida/analysis/py_line.c: + * plugins/pyoida/py_log.c: + Adapt code for supporting Python 3. + 09-10-29 Cyrille Bagard * src/analysis/exporter.c: diff --git a/plugins/pyoida/analysis/py_binary.c b/plugins/pyoida/analysis/py_binary.c index c8d7446..04d4881 100644 --- a/plugins/pyoida/analysis/py_binary.c +++ b/plugins/pyoida/analysis/py_binary.c @@ -71,8 +71,11 @@ pybinary_dealloc(pybinary* self) //printf("dealloc\n"); +#if PY_VERSION_HEX < 0x03000000 self->ob_type->tp_free((PyObject*)self); - //Py_TYPE(self)->tp_free((PyObject*)self); +#else + Py_TYPE(self)->tp_free((PyObject*)self); +#endif //printf("dealloc::end\n"); diff --git a/plugins/pyoida/analysis/py_line.c b/plugins/pyoida/analysis/py_line.c index bce8c1e..e981dbe 100644 --- a/plugins/pyoida/analysis/py_line.c +++ b/plugins/pyoida/analysis/py_line.c @@ -116,8 +116,11 @@ pyline_dealloc(PyLine *self) g_object_set_data(G_OBJECT(self->line), "pyline", NULL); +#if PY_VERSION_HEX < 0x03000000 self->ob_type->tp_free((PyObject*)self); - //Py_TYPE(self)->tp_free((PyObject*)self); +#else + Py_TYPE(self)->tp_free((PyObject*)self); +#endif //printf("dealloc::end\n"); diff --git a/plugins/pyoida/py_log.c b/plugins/pyoida/py_log.c index 706d626..ea43e5c 100644 --- a/plugins/pyoida/py_log.c +++ b/plugins/pyoida/py_log.c @@ -143,8 +143,11 @@ pylog_dealloc(pylog* self) //printf("dealloc\n"); +#if PY_VERSION_HEX < 0x03000000 self->ob_type->tp_free((PyObject*)self); - //Py_TYPE(self)->tp_free((PyObject*)self); +#else + Py_TYPE(self)->tp_free((PyObject*)self); +#endif //printf("dealloc::end\n"); -- cgit v0.11.2-87-g4458