Merge pull request #40 from nphilipp/develop--py3k-fixes

Miscellaneous fixes for Python, mostly version 3

Paul Brossier committed 10 years ago

Commit 4041a6d2 parents 7c785e6 b8ed85e10 files · +34 −20Browse files

Showing the changes to python (10 of 10 files). Show all

Unified · Split

10 files

python/VERSION +1 −1
python/ext/aubio-types.h +5 −0
python/ext/aubiowraphell.h +2 −2
python/ext/py-cvec.c +1 −1
python/ext/py-filter.c +1 −1
python/ext/py-sink.c +1 −1
python/ext/py-source.c +1 −1
python/lib/aubio/midiconv.py +11 −8
python/lib/gen_pyobject.py +1 −1
python/lib/generator.py +10 −4

@@ -1,7 +1,7 @@
1	AUBIO_MAJOR_VERSION=0	1	AUBIO_MAJOR_VERSION=0
2	AUBIO_MINOR_VERSION=4	2	AUBIO_MINOR_VERSION=4
3	AUBIO_PATCH_VERSION=2	3	AUBIO_PATCH_VERSION=2
4	AUBIO_VERSION_STATUS='~alpha'	4	AUBIO_VERSION_STATUS='a0'
5	LIBAUBIO_LT_CUR=4	5	LIBAUBIO_LT_CUR=4
6	LIBAUBIO_LT_REV=1	6	LIBAUBIO_LT_REV=1
7	LIBAUBIO_LT_AGE=1	7	LIBAUBIO_LT_AGE=1

python/ext/aubio-types.h+5−0

 #define AUBIO_NPY_SMPL NPY_FLOAT
 #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+2−2

@@ -13,7 +13,7 @@ Py_ ## NAME ## _init (Py_ ## NAME * self, PyObject * args, PyObject * kwds) \ · 12 unmodified lines
13	{ \	13	{ \
14	self->o = new_aubio_## NAME ( PARAMS ); \	14	self->o = new_aubio_## NAME ( PARAMS ); \
15	if (self->o == NULL) { \	15	if (self->o == NULL) { \
16	PyErr_SetString (PyExc_StandardError, "error creating object"); \	16	PyErr_SetString (PyExc_RuntimeError, "error creating object"); \
17	return -1; \	17	return -1; \
18	} \	18	} \
19	\	19	\
@@ -25,7 +25,7 @@ static void \ · 5 unmodified lines
25	Py_ ## NAME ## _del ( Py_ ## NAME * self) \	25	Py_ ## NAME ## _del ( Py_ ## NAME * self) \
26	{ \	26	{ \
27	del_aubio_ ## NAME (self->o); \	27	del_aubio_ ## NAME (self->o); \
28	self->ob_type->tp_free ((PyObject *) self); \	28	Py_TYPE(self)->tp_free ((PyObject *) self); \
29	}	29	}
30		30
31	#define AUBIO_MEMBERS_START(NAME) \	31	#define AUBIO_MEMBERS_START(NAME) \

python/ext/py-cvec.c+1−1

@@ -59,7 +59,7 @@ static void · 58 unmodified lines
59	Py_cvec_del (Py_cvec * self)	59	Py_cvec_del (Py_cvec * self)
60	{	60	{
61	del_cvec (self->o);	61	del_cvec (self->o);
62	self->ob_type->tp_free ((PyObject *) self);	62	Py_TYPE(self)->tp_free ((PyObject *) self);
63	}	63	}
64		64
65	static PyObject *	65	static PyObject *

python/ext/py-filter.c+1−1

@@ -57,7 +57,7 @@ Py_filter_del (Py_filter * self) · 56 unmodified lines
57	{	57	{
58	del_fvec(self->out);	58	del_fvec(self->out);
59	del_aubio_filter (self->o);	59	del_aubio_filter (self->o);
60	self->ob_type->tp_free ((PyObject *) self);	60	Py_TYPE(self)->tp_free ((PyObject *) self);
61	}	61	}
62		62
63	static PyObject *	63	static PyObject *

python/ext/py-sink.c+1−1

@@ -115,7 +115,7 @@ Py_sink_init (Py_sink * self, PyObject * args, PyObject * kwds) · 114 unmodified lines
115	aubio_sink_preset_samplerate ( self->o, self->samplerate );	115	aubio_sink_preset_samplerate ( self->o, self->samplerate );
116	}	116	}
117	if (self->o == NULL) {	117	if (self->o == NULL) {
118	PyErr_SetString (PyExc_StandardError, "error creating sink with this uri");	118	PyErr_SetString (PyExc_RuntimeError, "error creating sink with this uri");
119	return -1;	119	return -1;
120	}	120	}
121	self->samplerate = aubio_sink_get_samplerate ( self->o );	121	self->samplerate = aubio_sink_get_samplerate ( self->o );

python/ext/py-source.c+1−1

@@ -139,7 +139,7 @@ Py_source_init (Py_source * self, PyObject * args, PyObject * kwds) · 138 unmodified lines
139	if (self->o == NULL) {	139	if (self->o == NULL) {
140	char_t errstr[30 + strlen(self->uri)];	140	char_t errstr[30 + strlen(self->uri)];
141	sprintf(errstr, "error creating source with %s", self->uri);	141	sprintf(errstr, "error creating source with %s", self->uri);
142	PyErr_SetString (PyExc_StandardError, errstr);	142	PyErr_SetString (PyExc_RuntimeError, errstr);
143	return -1;	143	return -1;
144	}	144	}
145	self->samplerate = aubio_source_get_samplerate ( self->o );	145	self->samplerate = aubio_source_get_samplerate ( self->o );

python/lib/aubio/midiconv.py+11−8

     _valid_modifiers = {None: 0, u'♮': 0, '#': +1, u'♯': +1, u'\udd2a': +2, 'b': -1, u'♭': -1, u'\ufffd': -2}
     _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
     if len(note) == 4:
     octave = int(octave)
     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
 def midi2note(midi):
     " 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']
     return _valid_notenames[midi % 12] + str( midi / 12 - 1)

python/lib/gen_pyobject.py+1−1

@@ -70,7 +70,7 @@ def get_params_types_names(proto): · 69 unmodified lines
70	example: proto = "int main (int argc, char ** argv)"	70	example: proto = "int main (int argc, char ** argv)"
71	returns: [['int', 'argc'], ['char **','argv']]	71	returns: [['int', 'argc'], ['char **','argv']]
72	"""	72	"""
73	return map(split_type, get_params(proto))	73	return list(map(split_type, get_params(proto)))
74		74
75	def get_return_type(proto):	75	def get_return_type(proto):
76	import re	76	import re

python/lib/generator.py+10−4

 """ This file generates a c file from a list of cpp prototypes. """
 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():
   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
   while 1:
       object_methods = filter(lambda x: this_object in x, cpp_output)
       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)
           for method in new_methods:
           for method in new_methods:
               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)
           for method in del_methods:
       elif len(del_methods) < 1:
           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
           #write_msg("-- WARNING: more than one do method for", object_name)
       other_methods = filter(lambda x: x not in    do_methods, other_methods)
       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:
           write_msg("-- WARNING: some methods for", object_name, "were unidentified")

Merge pull request #40 from nphilipp/develop--py3k-fixes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code