Changes in / [7c785e6:4041a6d]

Location:

python

Files:

• VERSION (modified) (1 diff)
• ext/aubio-types.h (modified) (1 diff)
• ext/aubiowraphell.h (modified) (2 diffs)
• ext/py-cvec.c (modified) (1 diff)
• ext/py-filter.c (modified) (1 diff)
• ext/py-sink.c (modified) (1 diff)
• ext/py-source.c (modified) (1 diff)
• lib/aubio/midiconv.py (modified) (3 diffs)
• lib/gen_pyobject.py (modified) (1 diff)
• lib/generator.py (modified) (6 diffs)

python/VERSION

@@ -2 +2 @@
 AUBIO_MINOR_VERSION=4
 AUBIO_PATCH_VERSION=2
-AUBIO_VERSION_STATUS='~alpha'
+AUBIO_VERSION_STATUS='a0'
 LIBAUBIO_LT_CUR=4
 LIBAUBIO_LT_REV=1

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

@@ -14 +14 @@
   self->o = new_aubio_## NAME ( PARAMS ); \
   if (self->o == NULL) { \
-    PyErr_SetString (PyExc_StandardError, "error creating object"); \
+    PyErr_SetString (PyExc_RuntimeError, "error creating object"); \
     return -1; \
   } \
@@ -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

@@ -58 +58 @@
   del_fvec(self->out);
   del_aubio_filter (self->o);
-  self->ob_type->tp_free ((PyObject *) self);
+  Py_TYPE(self)->tp_free ((PyObject *) self);
 }
 

python/ext/py-sink.c

@@ -116 +116 @@
   }
   if (self->o == NULL) {
-    PyErr_SetString (PyExc_StandardError, "error creating sink with this uri");
+    PyErr_SetString (PyExc_RuntimeError, "error creating sink with this uri");
     return -1;
   }

python/ext/py-source.c

@@ -140 +140 @@
     char_t errstr[30 + strlen(self->uri)];
     sprintf(errstr, "error creating source with %s", self->uri);
-    PyErr_SetString (PyExc_StandardError, errstr);
+    PyErr_SetString (PyExc_RuntimeError, errstr);
     return -1;
   }

python/lib/aubio/midiconv.py

@@ -7 +7 @@
     _valid_octaves = range(-1, 10)
     if type(note) not in (str, unicode):
-        raise TypeError, "a string is required, got %s" % note
+        raise TypeError("a string is required, got %s" % note)
     if not (1 < len(note) < 5):
-        raise ValueError, "string of 2 to 4 characters expected, got %d (%s)" % (len(note), note)
+        raise ValueError(
+                "string of 2 to 4 characters expected, got %d (%s)" %
+                (len(note), note))
     notename, modifier, octave = [None]*3
 
@@ -27 +29 @@
 
     if notename not in _valid_notenames:
-        raise ValueError, "%s is not a valid note name" % notename
+        raise ValueError("%s is not a valid note name" % notename)
     if modifier not in _valid_modifiers:
-        raise ValueError, "%s is not a valid modifier" % modifier
+        raise ValueError("%s is not a valid modifier" % modifier)
     if octave not in _valid_octaves:
-        raise ValueError, "%s is not a valid octave" % octave
+        raise ValueError("%s is not a valid octave" % octave)
 
     midi = 12 + octave * 12 + _valid_notenames[notename] + _valid_modifiers[modifier]
     if midi > 127:
-        raise ValueError, "%s is outside of the range C-2 to G8" % note
+        raise ValueError("%s is outside of the range C-2 to G8" % note)
     return midi
 
@@ -41 +43 @@
     " convert midi note number to note name, e.g. [0, 127] -> [C-1, G9] "
     if type(midi) != int:
-        raise TypeError, "an integer is required, got %s" % midi
+        raise TypeError("an integer is required, got %s" % midi)
     if not (-1 < midi < 128):
-        raise ValueError, "an integer between 0 and 127 is excepted, got %d" % midi
+        raise ValueError(
+                "an integer between 0 and 127 is excepted, got %d" % midi)
     midi = int(midi)
     _valid_notenames = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']

python/lib/gen_pyobject.py

@@ -71 +71 @@
     returns: [['int', 'argc'], ['char **','argv']]
     """
-    return map(split_type, get_params(proto)) 
+    return list(map(split_type, get_params(proto)))
 
 def get_return_type(proto):

python/lib/generator.py

@@ -4 +4 @@
 
 import os, sys, shutil
-from gen_pyobject import write_msg, gen_new_init, gen_do, gen_members, gen_methods, gen_finish
+from .gen_pyobject import write_msg, gen_new_init, gen_do, gen_members, gen_methods, gen_finish
 
 def get_cpp_objects():
@@ -12 +12 @@
   cpp_output = filter(lambda y: len(y) > 1, cpp_output)
   cpp_output = filter(lambda y: not y.startswith('#'), cpp_output)
+  cpp_output = list(cpp_output)
 
   i = 1
@@ -86 +87 @@
       object_methods = [a.strip() for a in object_methods]
       object_methods = filter(lambda x: not x.startswith('typedef'), object_methods)
+      object_methods = list(object_methods)
       #for method in object_methods:
       #    write_msg(method)
-      new_methods = filter(lambda x: 'new_'+object_name in x, object_methods)
+      new_methods = list(filter(
+          lambda x: 'new_'+object_name in x, object_methods))
       if len(new_methods) > 1:
           write_msg("-- WARNING: more than one new method for", object_name)
@@ -99 +102 @@
               write_msg(method)
 
-      del_methods = filter(lambda x: 'del_'+object_name in x, object_methods)
+      del_methods = list(filter(
+          lambda x: 'del_'+object_name in x, object_methods))
       if len(del_methods) > 1:
           write_msg("-- WARNING: more than one del method for", object_name)
@@ -107 +111 @@
           write_msg("-- WARNING: no del method for", object_name)
 
-      do_methods = filter(lambda x: object_name+'_do' in x, object_methods)
+      do_methods = list(filter(
+          lambda x: object_name+'_do' in x, object_methods))
       if len(do_methods) > 1:
           pass
@@ -136 +141 @@
       other_methods = filter(lambda x: x not in get_methods, other_methods)
       other_methods = filter(lambda x: x not in set_methods, other_methods)
+      other_methods = list(other_methods)
 
       if len(other_methods) > 0: