Changeset ade36e6

Timestamp:

Apr 18, 2016, 11:23:08 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:

333eec1

Parents:

7ffb554

Message:

python/lib/gen_pyobject.py: prepare for python3 (see #33)

File:

• python/lib/gen_pyobject.py (modified) (5 diffs)

python/lib/gen_pyobject.py

@@ -151 +151 @@
     'fvec_t*': 'PyAubio_ArrayToCFvec',
     'cvec_t*': 'PyAubio_ArrayToCCvec',
-    'uint_t': '(uint_t)PyInt_AsLong',
+    'uint_t': '(uint_t)PyLong_AsLong',
 }
 
@@ -159 +159 @@
     'cvec_t*': 'PyAubio_CCvecToPyCvec',
     'smpl_t': 'PyFloat_FromDouble',
-    'uint_t*': 'PyInt_FromLong',
-    'uint_t': 'PyInt_FromLong',
+    'uint_t*': 'PyLong_FromLong',
+    'uint_t': 'PyLong_FromLong',
 }
 
@@ -172 +172 @@
     # "param1", "param2", "param3"
     paramnames = ", ".join(["\""+p['name']+"\"" for p in newparams])
-    pyparams = "".join(map(lambda p: aubio2pytypes[p['type']], newparams))
+    pyparams = "".join([aubio2pytypes[p['type']] for p in newparams])
     paramrefs = ", ".join(["&" + p['name'] for p in newparams])
     s = """\
@@ -289 +289 @@
 
     inputvecs = "  /* input vectors prototypes */\n  "
-    inputvecs += "\n  ".join(map(lambda p: p['type'] + ' ' + p['name'] + ";", inputparams))
+    inputvecs += "\n  ".join([ p['type'] + ' ' + p['name'] + ";" for p in inputparams])
 
     parseinput = "  /* input vectors parsing */\n  "
@@ -363 +363 @@
     n_param = len(doparams)
 
-    if name in param_numbers.keys():
+    if name in list(param_numbers.keys()):
       n_input_param, n_output_param = param_numbers[name]
     else: