Changeset 770b9e7 for python/ext

Timestamp:

Nov 26, 2015, 2:48:03 PM (9 years ago)

Author:

Nils Philippsen <nils@tiptoe.de>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

ac7e49b

Parents:

8b8a020

git-author:

Nils Philippsen <nils@tiptoe.de> (11/26/15 00:38:48)

git-committer:

Nils Philippsen <nils@tiptoe.de> (11/26/15 14:48:03)

Message:

Python 3: use Py_TYPE() instead of ob_type member

Location:

python/ext

Files:

• aubio-types.h (modified) (1 diff)
• aubiowraphell.h (modified) (1 diff)
• py-cvec.c (modified) (1 diff)
• py-filter.c (modified) (1 diff)

python/ext/aubio-types.h

@@ -40 +40 @@
 #endif
 
+// compat with Python < 2.6
+#ifndef Py_TYPE
+#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
 // special python type for cvec
 typedef struct

python/ext/aubiowraphell.h

@@ -26 +26 @@
 { \
   del_aubio_ ## NAME (self->o); \
-  self->ob_type->tp_free ((PyObject *) self); \
+  Py_TYPE(self)->tp_free ((PyObject *) self); \
 }
 

python/ext/py-cvec.c

@@ -60 +60 @@
 {
   del_cvec (self->o);
-  self->ob_type->tp_free ((PyObject *) self);
+  Py_TYPE(self)->tp_free ((PyObject *) self);
 }
 

python/ext/py-filter.c

@@ -56 +56 @@
 {
   del_aubio_filter (self->o);
-  self->ob_type->tp_free ((PyObject *) self);
+  Py_TYPE(self)->tp_free ((PyObject *) self);
 }