Enable ruff COM rule and fix resulting warnings. NFC (emscripten-core#24208)

This change was automatically generated using `ruff fix`.

Author: sbc100

bootstrap.py

@@ -22,7 +22,7 @@
 actions = [
   ('npm packages', [
      'package.json',
-     'package-lock.json'
+     'package-lock.json',
    ], ['npm', 'ci']),
   ('create entry points', [
      'tools/maint/create_entry_points.py',

emcc.py

@@ -67,13 +67,13 @@
   '.m', '.mi', '.mm', '.mii', # ObjC/ObjC++
   '.bc', '.ll', # LLVM IR
   '.S', # asm with preprocessor
-  os.devnull # consider the special endingless filenames like /dev/null to be C
+  os.devnull, # consider the special endingless filenames like /dev/null to be C
 } | PREPROCESSED_EXTENSIONS
 
 # These symbol names are allowed in INCOMING_MODULE_JS_API but are not part of the
 # default set.
 EXTRA_INCOMING_JS_API = [
-  'fetchSettings'
+  'fetchSettings',
 ]
 
 SIMD_INTEL_FEATURE_TOWER = ['-msse', '-msse2', '-msse3', '-mssse3', '-msse4.1', '-msse4.2', '-msse4', '-mavx', '-mavx2']
@@ -85,7 +85,7 @@
     '--js-transform', '--oformat', '--output_eol', '--output-eol',
     '--post-js', '--pre-js', '--preload-file', '--profiling-funcs',
     '--proxy-to-worker', '--shell-file', '--source-map-base',
-    '--threadprofiler', '--use-preload-plugins'
+    '--threadprofiler', '--use-preload-plugins',
 }
 CLANG_FLAGS_WITH_ARGS = {
     '-MT', '-MF', '-MJ', '-MQ', '-D', '-U', '-o', '-x',
@@ -94,7 +94,7 @@
     '-isysroot', '-imultilib', '-A', '-isystem', '-iquote',
     '-install_name', '-compatibility_version', '-mllvm',
     '-current_version', '-I', '-L', '-include-pch', '-u',
-    '-undefined', '-target', '-Xlinker', '-Xclang', '-z'
+    '-undefined', '-target', '-Xlinker', '-Xclang', '-z',
 }
 
 

emrun.py

@@ -788,13 +788,13 @@ def get_cpu_info():
     return {'model': 'Unknown ("' + str(e) + '")',
             'physicalCores': 1,
             'logicalCores': 1,
-            'frequency': 0
+            'frequency': 0,
             }
 
   return {'model': platform.machine() + ', ' + cpu_name,
           'physicalCores': physical_cores,
           'logicalCores': logical_cores,
-          'frequency': frequency
+          'frequency': frequency,
           }
 
 
@@ -986,7 +986,7 @@ def get_browser_info(filename, format_json):
     return json.dumps({
       'name': browser_display_name(filename),
       'version': get_executable_version(filename),
-      'buildDate': get_browser_build_date(filename)
+      'buildDate': get_browser_build_date(filename),
     }, indent=2)
   else:
     return 'Browser: ' + browser_display_name(filename) + ' ' + get_executable_version(filename) + ', build ' + get_browser_build_date(filename)
@@ -1365,7 +1365,7 @@ def get_system_info(format_json):
       return json.dumps({'model': get_android_model(),
                          'os': get_android_os_version(),
                          'ram': get_system_memory(),
-                         'cpu': get_android_cpu_infoline()
+                         'cpu': get_android_cpu_infoline(),
                          }, indent=2)
     else:
       info = 'Model: ' + get_android_model() + '\n'

emsymbolizer.py

@@ -187,7 +187,7 @@ def lookup(self, offset):
     return LocationInfo(
         self.sources[info.source] if info.source is not None else None,
         info.line,
-        info.column
+        info.column,
       )
 
 

pyproject.toml

@@ -20,6 +20,7 @@ lint.select = [
   "ASYNC",
   "B",
   "C90",
+  "COM",
   "E",
   "F",
   "PERF",

test/common.py

@@ -461,12 +461,12 @@ def metafunc(self, wasmfs, fs, *args, **kwargs):
       assert fs is None
     func(self, *args, **kwargs)
 
-  parameterize(metafunc, {'': (False, None,),
-                          'nodefs': (False, 'nodefs',),
-                          'rawfs': (False, 'rawfs',),
-                          'wasmfs': (True, None,),
-                          'wasmfs_nodefs': (True, 'nodefs',),
-                          'wasmfs_rawfs': (True, 'rawfs',)})
+  parameterize(metafunc, {'': (False, None),
+                          'nodefs': (False, 'nodefs'),
+                          'rawfs': (False, 'rawfs'),
+                          'wasmfs': (True, None),
+                          'wasmfs_nodefs': (True, 'nodefs'),
+                          'wasmfs_rawfs': (True, 'rawfs')})
   return metafunc
 
 
@@ -1208,7 +1208,7 @@ def setUp(self):
       emcc_min_node_version = (
         int(emcc_min_node_version_str[0:2]),
         int(emcc_min_node_version_str[2:4]),
-        int(emcc_min_node_version_str[4:6])
+        int(emcc_min_node_version_str[4:6]),
       )
       if node_version < emcc_min_node_version:
         self.emcc_args += building.get_emcc_node_flags(node_version)
@@ -1279,7 +1279,7 @@ def tearDown(self):
         ignorable_file_prefixes = [
           '/tmp/tmpaddon',
           '/tmp/circleci-no-output-timeout',
-          '/tmp/wasmer'
+          '/tmp/wasmer',
         ]
 
         left_over_files = set(temp_files_after_run) - set(self.temp_files_before_run)
@@ -1652,7 +1652,7 @@ def assertContained(self, values, string, additional_info='', regex=False):
       diff = ''.join(a.rstrip() + '\n' for a in diff)
       self.fail("Expected to find '%s' in '%s', diff:\n\n%s\n%s" % (
         limit_size(values[0]), limit_size(string), limit_size(diff),
-        additional_info
+        additional_info,
       ))
 
   def assertNotContained(self, value, string):
@@ -2011,7 +2011,7 @@ def get_poppler_library(self, env_init=None):
 
     self.emcc_args += [
       '-I' + test_file('third_party/freetype/include'),
-      '-I' + test_file('third_party/poppler/include')
+      '-I' + test_file('third_party/poppler/include'),
     ]
 
     # Poppler has some pretty glaring warning.  Suppress them to keep the
@@ -2329,7 +2329,7 @@ def run_browser(self, html_file, expected=None, message=None, timeout=None, extr
       try:
         self.harness_in_queue.put((
           'http://localhost:%s/%s' % (self.PORT, html_file),
-          self.get_dir()
+          self.get_dir(),
         ))
         if timeout is None:
           timeout = self.BROWSER_TIMEOUT

test/other/ports/external.py

@@ -22,7 +22,7 @@
   'value1': None,
   'value2': None,
   'value3': "v3",
-  'dependency': None
+  'dependency': None,
 }
 
 deps = ['sdl2_image:formats=jpg']

test/test_benchmark.py

@@ -173,7 +173,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat
       cmd = compiler + [
         '-fno-math-errno',
         filename,
-        '-o', filename + '.native'
+        '-o', filename + '.native',
       ] + self.args + shared_args + native_args + clang_native.get_clang_native_args()
       # print(cmd)
       run_process(cmd, env=clang_native.get_clang_native_env())
@@ -199,7 +199,7 @@ def run_binaryen_opts(filename, opts):
   run_process([
     os.path.join(building.get_binaryen_bin(), 'wasm-opt', '--all-features'),
     filename,
-    '-o', filename
+    '-o', filename,
   ] + opts)
 
 
@@ -234,7 +234,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat
       OPTIMIZATIONS,
       '-sINITIAL_MEMORY=256MB',
       '-sENVIRONMENT=node,shell',
-      '-o', final
+      '-o', final,
     ] + LLVM_FEATURE_FLAGS
     if shared_args:
       cmd += shared_args
@@ -331,7 +331,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat
         '-cheerp-linear-heap-size=256',
         '-cheerp-secondary-output-file=' + final.replace('.js', '.wasm'),
         filename,
-        '-o', final
+        '-o', final,
       ] + shared_args
       # print(' '.join(cmd))
       run_process(cmd, stdout=PIPE, stderr=PIPE)
@@ -371,7 +371,7 @@ def get_output_files(self):
   'cherp-v8': CheerpBenchmarker('cheerp-v8-wasm', aot_v8),
   # TODO: ensure no baseline compiler is used, see v8
   'sm': EmscriptenBenchmarker('sm', config.SPIDERMONKEY_ENGINE),
-  'cherp-sm': CheerpBenchmarker('cheerp-sm-wasm', config.SPIDERMONKEY_ENGINE)
+  'cherp-sm': CheerpBenchmarker('cheerp-sm-wasm', config.SPIDERMONKEY_ENGINE),
 }
 
 for name in EMTEST_BENCHMARKERS.split(','):
@@ -411,7 +411,7 @@ def tearDownClass(cls):
       output = {
         'version': 1,
         'git_hash': '',
-        'results': cls.stats
+        'results': cls.stats,
       }
       utils.write_file('stats.json', json.dumps(output, indent=2) + '\n')
 
@@ -469,11 +469,11 @@ def add_stats(self, name, stats):
     self.stats.append({
       'key': {
         'test': name,
-        'units': 'bytes'
+        'units': 'bytes',
       },
       'measurements': {
-        'stats': stats
-      }
+        'stats': stats,
+      },
     })
 
   def test_primes(self, check=True):
@@ -750,7 +750,7 @@ def test_fannkuch(self):
           case 5: n = 12; break;
           default: printf("error: %d\\n", arg); return -1;
         }
-      '''
+      ''',
     )
     assert 'switch(arg)' in src
     self.do_benchmark('fannkuch', src, 'Pfannkuchen(')