Changes in python/lib/gen_external.py [50853b0:dad51ce]

File:

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

python/lib/gen_external.py

@@ -31 +31 @@
     'pitchyin',
     'pitchyinfft',
-    'pitchyinfast',
     'sink',
     'sink_apple_audio',
@@ -119 +118 @@
         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 +137 @@
 
 def get_cpp_objects_from_c_declarations(c_declarations, skip_objects=None):
-    if skip_objects is None:
+    if skip_objects == None:
         skip_objects = default_skip_objects
     typedefs = filter(lambda y: y.startswith('typedef struct _aubio'), c_declarations)
@@ -146 +145 @@
 
 
-def get_all_func_names_from_lib(lib):
+def get_all_func_names_from_lib(lib, depth=0):
     ''' return flat string of all function used in lib
     '''
     res = []
-    for _, v in lib.items():
+    indent = " " * depth
+    for k, v in lib.items():
         if isinstance(v, dict):
-            res += get_all_func_names_from_lib(v)
+            res += get_all_func_names_from_lib(v, depth + 1)
         elif isinstance(v, list):
             for elem in v: