flake8 fixes

Author: cclauss

tools/building.py

@@ -114,7 +114,7 @@ def side_module_external_deps(external_symbols):
     sym = demangle_c_symbol_name(sym)
     if sym in external_symbols:
       deps = deps.union(external_symbols[sym])
-  return sorted(deps)
+  return sorted(list(deps))
 
 
 def create_stub_object(external_symbols):
@@ -184,11 +184,12 @@ def lld_flags_for_executable(external_symbols):
     c_exports += side_module_external_deps(external_symbols)
   for export in c_exports:
     if settings.ERROR_ON_UNDEFINED_SYMBOLS:
-      cmd.append(f'--export={export}')
+      cmd.append('--export=' + export)
     else:
-      cmd.append(f'--export-if-defined={export}')
+      cmd.append('--export-if-defined=' + export)
 
-  cmd.extend(f'--export-if-defined={e}' for e in settings.EXPORT_IF_DEFINED)
+  for e in settings.EXPORT_IF_DEFINED:
+    cmd.append('--export-if-defined=' + e)
 
   if settings.RELOCATABLE:
     cmd.append('--experimental-pic')
@@ -425,7 +426,10 @@ def eval_ctors(js_file, wasm_file, debug_info):
     if kept_ctors:
       args += ['--kept-exports=' + ','.join(kept_ctors)]
   else:
-    ctor = '_start' if settings.EXPECT_MAIN else '_initialize'
+    if settings.EXPECT_MAIN:
+      ctor = '_start'
+    else:
+      ctor = '_initialize'
     args = ['--ctors=' + ctor, '--kept-exports=' + ctor]
   if settings.EVAL_CTORS == 2:
     args += ['--ignore-external-input']
@@ -745,10 +749,10 @@ def minify_wasm_js(js_file, wasm_file, expensive_optimizations, debug_info):
 
 
 def is_internal_global(name):
-  internal_start_stop_symbols = {'__start_em_asm', '__stop_em_asm',
+  internal_start_stop_symbols = set(['__start_em_asm', '__stop_em_asm',
                                      '__start_em_js', '__stop_em_js',
                                      '__start_em_lib_deps', '__stop_em_lib_deps',
-                                     '__em_lib_deps'}
+                                     '__em_lib_deps'])
   internal_prefixes = ('__em_js__', '__em_lib_deps')
   return name in internal_start_stop_symbols or any(name.startswith(p) for p in internal_prefixes)
 

tools/emscripten.py

@@ -225,7 +225,7 @@ def set_memory(static_bump):
 
 def report_missing_exports_wasm_only(metadata):
   if diagnostics.is_enabled('undefined'):
-    defined_symbols = {asmjs_mangle(e) for e in metadata.all_exports}
+    defined_symbols = set(asmjs_mangle(e) for e in metadata.all_exports)
     missing = set(settings.USER_EXPORTS) - defined_symbols
     for symbol in sorted(missing):
       diagnostics.warning('undefined', f'undefined exported symbol: "{symbol}"')
@@ -235,7 +235,7 @@ def report_missing_exports(js_symbols):
   if diagnostics.is_enabled('undefined'):
     # Report any symbol that was explicitly exported but is present neither
     # as a native function nor as a JS library function.
-    defined_symbols = {asmjs_mangle(e) for e in settings.WASM_EXPORTS}.union(js_symbols)
+    defined_symbols = set(asmjs_mangle(e) for e in settings.WASM_EXPORTS).union(js_symbols)
     missing = set(settings.USER_EXPORTS) - defined_symbols
     for symbol in sorted(missing):
       diagnostics.warning('undefined', f'undefined exported symbol: "{symbol}"')
@@ -346,7 +346,10 @@ def emscript(in_wasm, out_wasm, outfile_js, js_syms, finalize=True, base_metadat
 
     for em_js_func, raw in metadata.em_js_funcs.items():
       c_sig = raw.split('<::>')[0].strip('()')
-      c_sig = [] if (c_sig or 'void') == 'void' else c_sig.split(',')
+      if not c_sig or c_sig == 'void':
+        c_sig = []
+      else:
+        c_sig = c_sig.split(',')
       if em_js_func in import_map:
         imp = import_map[em_js_func]
         assert imp.kind == webassembly.ExternType.FUNC
@@ -643,8 +646,11 @@ def create_tsd_exported_runtime_methods(metadata):
   tsc_output_file = in_temp('jsdoc.d.ts')
   utils.write_file(js_doc_file, js_doc)
   tsc = shutil.which('tsc')
-  # Use the full path from the which command so windows can find tsc.
-  tsc = [tsc] if tsc else shared.get_npm_cmd('tsc')
+  if tsc:
+    # Use the full path from the which command so windows can find tsc.
+    tsc = [tsc]
+  else:
+    tsc = shared.get_npm_cmd('tsc')
   cmd = tsc + ['--outFile', tsc_output_file, '--declaration', '--emitDeclarationOnly', '--allowJs', js_doc_file]
   shared.check_call(cmd, cwd=path_from_root())
   return utils.read_file(tsc_output_file)
@@ -693,12 +699,15 @@ def create_asm_consts(metadata):
   asm_consts = {}
   for addr, const in metadata.em_asm_consts.items():
     body = trim_asm_const_body(const)
+    args = []
     max_arity = 16
     arity = 0
     for i in range(max_arity):
-      if f'${i}' in const:
+      if ('$' + str(i)) in const:
         arity = i + 1
-    args = ', '.join(f"${i}" for i in range(arity))
+    for i in range(arity):
+      args.append('$' + str(i))
+    args = ', '.join(args)
     if 'arguments' in body:
       # arrow functions don't bind `arguments` so we have to use
       # the old function syntax in this case
@@ -708,7 +717,8 @@ def create_asm_consts(metadata):
     if settings.RELOCATABLE:
       addr += settings.GLOBAL_BASE
     asm_consts[addr] = func
-  asm_consts = sorted(asm_consts.items())
+  asm_consts = [(key, value) for key, value in asm_consts.items()]
+  asm_consts.sort()
   return asm_consts
 
 
@@ -752,7 +762,10 @@ def create_em_js(metadata):
     assert separator in raw
     args, body = raw.split(separator, 1)
     args = args[1:-1]
-    args = [] if args == 'void' else args.split(',')
+    if args == 'void':
+      args = []
+    else:
+      args = args.split(',')
     arg_names = [arg.split()[-1].replace('*', '') for arg in args if arg]
     args = ','.join(arg_names)
     func = f'function {name}({args}) {body}'
@@ -823,8 +836,10 @@ def add_standard_wasm_imports(send_items_map):
 
 def create_sending(metadata, library_symbols):
   # Map of wasm imports to mangled/external/JS names
-  send_items_map = {name: name for name in metadata.imports}
+  send_items_map = {}
 
+  for name in metadata.invoke_funcs:
+    send_items_map[name] = name
   for name in metadata.imports:
     if name in metadata.em_js_funcs:
       send_items_map[name] = name
@@ -888,7 +903,9 @@ def install_wrapper(sym):
     # pthread_self and _emscripten_proxy_execute_task_queue are currently called in some
     # cases after the runtime has exited.
     # TODO: Look into removing these, and improving our robustness around thread termination.
-    return sym not in {'__trap', 'pthread_self', '_emscripten_proxy_execute_task_queue'}
+    if sym in ('__trap', 'pthread_self', '_emscripten_proxy_execute_task_queue'):
+      return False
+    return True
 
   for name, types in function_exports.items():
     nargs = len(types.params)

tools/maint/gen_struct_info.py

@@ -205,7 +205,7 @@ def gen_inspect_code(path, struct, code):
 
 def generate_c_code(headers):
   code = ['#include <stdio.h>', '#include <stddef.h>']
-  
+
   code.extend(f'''#include "{header['name']}"''' for header in headers)
 
   code.append('int main() {')