From ade36e60bf5e7041c3f8e2ddf4f507fb66e10d2e Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 18 Apr 2016 23:23:08 +0200 Subject: [PATCH] python/lib/gen_pyobject.py: prepare for python3 (see #33) --- python/lib/gen_pyobject.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/lib/gen_pyobject.py b/python/lib/gen_pyobject.py index e4c59b2e..ca6a8700 100644 --- a/python/lib/gen_pyobject.py +++ b/python/lib/gen_pyobject.py @@ -150,7 +150,7 @@ aubio2pytypes = { aubiovecfrompyobj = { 'fvec_t*': 'PyAubio_ArrayToCFvec', 'cvec_t*': 'PyAubio_ArrayToCCvec', - 'uint_t': '(uint_t)PyInt_AsLong', + 'uint_t': '(uint_t)PyLong_AsLong', } # aubio to python @@ -158,8 +158,8 @@ aubiovectopyobj = { 'fvec_t*': 'PyAubio_CFvecToArray', 'cvec_t*': 'PyAubio_CCvecToPyCvec', 'smpl_t': 'PyFloat_FromDouble', - 'uint_t*': 'PyInt_FromLong', - 'uint_t': 'PyInt_FromLong', + 'uint_t*': 'PyLong_FromLong', + 'uint_t': 'PyLong_FromLong', } def gen_new_init(newfunc, name): @@ -171,7 +171,7 @@ def gen_new_init(newfunc, name): selfparams = '' # "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 = """\ // WARNING: this file is generated, DO NOT EDIT @@ -288,7 +288,7 @@ def gen_do_input_params(inputparams): inputdefs += " PyObject * " + p['name'] + "_obj;\n" 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 " for p in inputparams: @@ -362,7 +362,7 @@ def gen_do(dofunc, name): 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: n_input_param, n_output_param = 1, n_param - 1 -- 2.11.0