Changeset 06c329e for python

Timestamp:

Jul 24, 2017, 6:57:59 PM (7 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

Children:

34ce715

Parents:

ccd0327 (diff), 50853b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fix_genexternal.py_syntax'

File:

• python/lib/gen_external.py (modified) (3 diffs)

python/lib/gen_external.py

@@ -119 +119 @@
         if i >= len(cpp_output):
             break
-        if ('{' in cpp_output[i - 1]) and (not '}' in cpp_output[i - 1]) or (not ';' in cpp_output[i - 1]):
+        if ('{' in cpp_output[i - 1]) and ('}' not in cpp_output[i - 1]) or (';' not in cpp_output[i - 1]):
             cpp_output[i] = cpp_output[i - 1] + ' ' + cpp_output[i]
             cpp_output.pop(i - 1)
@@ -138 +138 @@
 
 def get_cpp_objects_from_c_declarations(c_declarations, skip_objects=None):
-    if skip_objects == None:
+    if skip_objects is None:
         skip_objects = default_skip_objects
     typedefs = filter(lambda y: y.startswith('typedef struct _aubio'), c_declarations)
@@ -146 +146 @@
 
 
-def get_all_func_names_from_lib(lib, depth=0):
+def get_all_func_names_from_lib(lib):
     ''' return flat string of all function used in lib
     '''
     res = []
-    indent = " " * depth
-    for k, v in lib.items():
+    for _, v in lib.items():
         if isinstance(v, dict):
-            res += get_all_func_names_from_lib(v, depth + 1)
+            res += get_all_func_names_from_lib(v)
         elif isinstance(v, list):
             for elem in v: