Changeset 5c1200a

Timestamp:

Apr 18, 2016, 10:53:24 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

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:

0e59ae0

Parents:

2e4ae1d

Message:

python/ext: continue preparing for python 3

Location:

python/ext

Files:

• aubiowraphell.h (modified) (1 diff)
• py-cvec.c (modified) (3 diffs)
• py-fft.c (modified) (2 diffs)
• py-filter.c (modified) (1 diff)
• py-filterbank.c (modified) (2 diffs)
• py-phasevoc.c (modified) (1 diff)
• py-source.c (modified) (5 diffs)

python/ext/aubiowraphell.h

@@ -44 +44 @@
 #define AUBIO_TYPEOBJECT(NAME, PYNAME) \
 PyTypeObject Py_ ## NAME ## Type = { \
-  PyObject_HEAD_INIT (NULL)    \
-  0,                           \
+  PyVarObject_HEAD_INIT (NULL, 0) \
   PYNAME,                      \
   sizeof (Py_ ## NAME),          \

python/ext/py-cvec.c

@@ -70 +70 @@
   PyObject *result = NULL;
 
-  format = PyString_FromString ("aubio cvec of %d elements");
+  format = PyUnicode_FromString ("aubio cvec of %d elements");
   if (format == NULL) {
     goto fail;
@@ -81 +81 @@
   cvec_print ( self->o );
 
-  result = PyString_Format (format, args);
+  result = PyUnicode_Format (format, args);
 
 fail:
@@ -261 +261 @@
 
 PyTypeObject Py_cvecType = {
-  PyObject_HEAD_INIT (NULL)
-  0,                            /* ob_size           */
+  PyVarObject_HEAD_INIT(NULL, 0)
   "aubio.cvec",                 /* tp_name           */
   sizeof (Py_cvec),             /* tp_basicsize      */

python/ext/py-fft.c

@@ -51 +51 @@
     char_t errstr[30];
     sprintf(errstr, "error creating fft with win_s=%d", self->win_s);
-    PyErr_SetString (PyExc_StandardError, errstr);
+    PyErr_SetString (PyExc_Exception, errstr);
     return -1;
   }
@@ -66 +66 @@
   del_cvec(self->out);
   del_fvec(self->rout);
-  self->ob_type->tp_free((PyObject *) self);
+  Py_TYPE(self)->tp_free((PyObject *) self);
 }
 

python/ext/py-filter.c

@@ -163 +163 @@
 
 PyTypeObject Py_filterType = {
-  PyObject_HEAD_INIT (NULL)
-  0,                            /* ob_size           */
+  PyVarObject_HEAD_INIT(NULL, 0)
   "aubio.digital_filter",       /* tp_name           */
   sizeof (Py_filter),           /* tp_basicsize      */

python/ext/py-filterbank.c

@@ -60 +60 @@
     sprintf(errstr, "error creating filterbank with n_filters=%d, win_s=%d",
         self->n_filters, self->win_s);
-    PyErr_SetString (PyExc_StandardError, errstr);
+    PyErr_SetString (PyExc_RuntimeError, errstr);
     return -1;
   }
@@ -73 +73 @@
   del_aubio_filterbank(self->o);
   del_fvec(self->out);
-  self->ob_type->tp_free((PyObject *) self);
+  Py_TYPE(self)->tp_free((PyObject *) self);
 }
 

python/ext/py-phasevoc.c

@@ -71 +71 @@
   del_cvec(self->output);
   del_fvec(self->routput);
-  self->ob_type->tp_free((PyObject *) self);
+  Py_TYPE(self)->tp_free((PyObject *) self);
 }
 

python/ext/py-source.c

@@ -160 +160 @@
   del_fvec(self->read_to);
   del_fmat(self->mread_to);
-  self->ob_type->tp_free((PyObject *) self);
+  Py_TYPE(self)->tp_free((PyObject *) self);
 }
 
@@ -187 +187 @@
   PyObject *outputs = PyList_New(0);
   PyList_Append( outputs, (PyObject *)PyAubio_CFvecToArray (self->read_to));
-  PyList_Append( outputs, (PyObject *)PyInt_FromLong (read));
+  PyList_Append( outputs, (PyObject *)PyLong_FromLong(read));
   return outputs;
 }
@@ -214 +214 @@
   PyObject *outputs = PyList_New(0);
   PyList_Append( outputs, (PyObject *)PyAubio_CFmatToArray (self->mread_to));
-  PyList_Append( outputs, (PyObject *)PyInt_FromLong (read));
+  PyList_Append( outputs, (PyObject *)PyLong_FromLong(read));
   return outputs;
 }
@@ -234 +234 @@
 {
   uint_t tmp = aubio_source_get_samplerate (self->o);
-  return (PyObject *)PyInt_FromLong (tmp);
+  return (PyObject *)PyLong_FromLong (tmp);
 }
 
@@ -241 +241 @@
 {
   uint_t tmp = aubio_source_get_channels (self->o);
-  return (PyObject *)PyInt_FromLong (tmp);
+  return (PyObject *)PyLong_FromLong (tmp);
 }