Enable UP ruff checks and fix resulting warnings. NFC (#24198)

Author: sbc100

emcc.py

@@ -535,7 +535,7 @@ def run(args):
   # read response files very early on
   try:
     args = substitute_response_files(args)
-  except IOError as e:
+  except OSError as e:
     exit_with_error(e)
 
   if '--help' in args:

emrun.py

@@ -4,6 +4,10 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
+# This file needs to run on older version of python too (even python 2!) so
+# suppress these upgrade warnings:
+# ruff: noqa: UP015, UP024, UP021, UP025
+
 """emrun: Implements machinery that allows running a .html page as if it was a
 standard executable file.
 

emsymbolizer.py

@@ -31,7 +31,7 @@ class Error(BaseException):
 
 
 # Class to treat location info in a uniform way across information sources.
-class LocationInfo(object):
+class LocationInfo:
   def __init__(self, source=None, line=0, column=0, func=None):
     self.source = source
     self.line = line
@@ -98,8 +98,8 @@ def get_sourceMappingURL_section(module):
   return None
 
 
-class WasmSourceMap(object):
-  class Location(object):
+class WasmSourceMap:
+  class Location:
     def __init__(self, source=None, line=0, column=0, func=None):
       self.source = source
       self.line = line

pyproject.toml

@@ -1,3 +1,6 @@
+[project]
+requires-python = ">=3.8"
+
 [tool.ruff]
 exclude = [
   "./cache/",
@@ -22,6 +25,7 @@ lint.select = [
   "PERF",
   "PIE",
   "PL",
+  "UP",
   "W",
   "YTT",
 ]
@@ -42,6 +46,9 @@ lint.ignore = [
   "PLW0603",
   "PLW1510",
   "PLW2901",
+  "UP030", # TODO
+  "UP031", # TODO
+  "UP032", # TODO
 ]
 lint.per-file-ignores."emrun.py" = [ "PLE0704" ]
 lint.per-file-ignores."tools/ports/*.py" = [ "ARG001", "ARG005" ]

requirements-dev.txt

@@ -6,7 +6,7 @@
 
 coverage[toml]==6.5
 mypy==1.14
-ruff==0.11.4
+ruff==0.11.7
 types-requests==2.32.0.20241016
 unittest-xml-reporting==3.2.0
 

site/source/get_api_items.py

@@ -65,7 +65,7 @@ def addapiitems(matchobj):
             filepath = api_reference_directory + file
             print(file)
             # open file
-            with open(filepath, 'r') as infile:
+            with open(filepath) as infile:
                 for line in infile:
                     # parse line for API items
                     re.sub(r'^\.\.\s+((\w+)\:(\w+)\:\:(.*))', addapiitems, line)

site/source/get_wiki.py

@@ -57,7 +57,7 @@ def errorhandler(func, path, exc_info):
     try:
         shutil.rmtree(output_dir, ignore_errors=False, onerror=errorhandler)
         print('Old wiki clone removed')
-    except IOError:
+    except OSError:
         print('No directory to clean found')
 
 

system/bin/sdl-config.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 
 print('emscripten sdl-config called with', ' '.join(sys.argv), file=sys.stderr)

test/common.py

@@ -2079,7 +2079,7 @@ def send_head(self):
         try:
           fsize = os.path.getsize(path)
           f = open(path, 'rb')
-        except IOError:
+        except OSError:
           self.send_error(404, f'File not found {path}')
           return None
         self.send_response(206)

test/jsrun.py

@@ -108,7 +108,7 @@ def run_js(filename, engine, args=None,
         input=input,
         cwd=cwd,
         timeout=timeout,
-        universal_newlines=True)
+        text=True)
   except Exception:
     # the failure may be because the engine is not present. show the proper
     # error in that case

test/parallel_testsuite.py

@@ -95,7 +95,7 @@ def combine_results(self, result, buffered_results):
     return result
 
 
-class BufferedParallelTestResult():
+class BufferedParallelTestResult:
   """A picklable struct used to communicate test results across processes
 
   Fulfills the interface for unittest.TestResult
@@ -152,7 +152,7 @@ def addError(self, test, err):
     self.buffered_result = BufferedTestError(test, err)
 
 
-class BufferedTestBase():
+class BufferedTestBase:
   """Abstract class that holds test result data, split by type of result."""
   def __init__(self, test, err=None):
     self.test = test
@@ -216,7 +216,7 @@ def updateResult(self, result):
     result.addUnexpectedSuccess(self.test)
 
 
-class FakeTraceback():
+class FakeTraceback:
   """A fake version of a traceback object that is picklable across processes.
 
   Python's traceback objects contain hidden stack information that isn't able
@@ -235,14 +235,14 @@ def __init__(self, tb):
     self.tb_lasti = tb.tb_lasti
 
 
-class FakeFrame():
+class FakeFrame:
   def __init__(self, f):
     self.f_code = FakeCode(f.f_code)
     # f.f_globals is not picklable, not used in stack traces, and needs to be iterable
     self.f_globals = []
 
 
-class FakeCode():
+class FakeCode:
   def __init__(self, co):
     self.co_filename = co.co_filename
     self.co_name = co.co_name

test/test_benchmark.py

@@ -56,7 +56,7 @@
 EMTEST_BENCHMARKERS = os.getenv('EMTEST_BENCHMARKERS', 'clang,v8,v8-lto,v8-ctors')
 
 
-class Benchmarker():
+class Benchmarker:
   # Whether to record statistics. Set by SizeBenchmarker.
   record_stats = False
 

test/test_browser.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # Copyright 2013 The Emscripten Authors.  All rights reserved.
 # Emscripten is available under two separate licenses, the MIT license and the
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
@@ -242,7 +241,7 @@ def proxy_to_worker(self):
   def require_jspi(self):
     if not is_chrome():
       self.skipTest(f'Current browser ({EMTEST_BROWSER}) does not support JSPI. Only chromium-based browsers ({CHROMIUM_BASED_BROWSERS}) support JSPI today.')
-    super(browser, self).require_jspi()
+    super().require_jspi()
 
   def post_manual_reftest(self):
     assert os.path.exists('reftest.js')

test/test_other.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # Copyright 2013 The Emscripten Authors.  All rights reserved.
 # Emscripten is available under two separate licenses, the MIT license and the
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
@@ -6710,7 +6709,7 @@ def test_create_readonly(self):
   def test_embed_file_large(self):
     # If such long files are encoded on one line,
     # they overflow the interpreter's limit
-    large_size = int(1500000)
+    large_size = 1500000
     create_file('large.txt', 'x' * large_size)
     create_file('src.c', r'''
       #include <stdio.h>

test/test_sockets.py

@@ -41,7 +41,7 @@ def clean_processes(processes):
         pass
 
 
-class WebsockifyServerHarness():
+class WebsockifyServerHarness:
   def __init__(self, filename, args, listen_port, do_server_check=True):
     self.processes = []
     self.filename = filename
@@ -81,7 +81,7 @@ def __enter__(self):
         proxy_sock = socket.create_connection(('localhost', self.listen_port), timeout=1)
         proxy_sock.close()
         break
-      except IOError:
+      except OSError:
         time.sleep(1)
     else:
       clean_processes(self.processes)
@@ -100,7 +100,7 @@ def __exit__(self, *args, **kwargs):
     clean_processes(self.processes)
 
 
-class CompiledServerHarness():
+class CompiledServerHarness:
   def __init__(self, filename, args, listen_port):
     self.processes = []
     self.filename = filename
@@ -134,7 +134,7 @@ def __exit__(self, *args, **kwargs):
 
 
 # Executes a native executable server process
-class BackgroundServerProcess():
+class BackgroundServerProcess:
   def __init__(self, args):
     self.processes = []
     self.args = args

tools/building.py

@@ -677,7 +677,7 @@ def move_to_safe_7bit_ascii_filename(filename):
 
   # Print input file (long wall of text!)
   if DEBUG == 2 and (proc.returncode != 0 or (len(proc.stderr.strip()) > 0 and closure_warnings['enabled'])):
-    input_file = open(filename, 'r').read().splitlines()
+    input_file = open(filename).read().splitlines()
     for i in range(len(input_file)):
       sys.stderr.write(f'{i + 1}: {input_file[i]}\n')
 

tools/experimental/reproduceriter.py

@@ -108,7 +108,6 @@
 
 '''
 
-from __future__ import print_function
 import os
 import re
 import sys

tools/file_packager.py

@@ -158,8 +158,7 @@ def has_hidden_attribute(filepath):
     return False
 
   try:
-    attrs = ctypes.windll.kernel32.GetFileAttributesW(
-        u'%s' % filepath)
+    attrs = ctypes.windll.kernel32.GetFileAttributesW(filepath)
     assert attrs != -1
     result = bool(attrs & 2)
   except Exception:
@@ -372,7 +371,7 @@ def main():  # noqa: C901, PLR0912, PLR0915
   # read response files very early on
   try:
     args = substitute_response_files(sys.argv[1:])
-  except IOError as e:
+  except OSError as e:
     shared.exit_with_error(e)
 
   if '--help' in args:

tools/gen_struct_info.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# coding=utf-8
 # Copyright 2013 The Emscripten Authors.  All rights reserved.
 # Emscripten is available under two separate licenses, the MIT license and the
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
@@ -336,7 +335,7 @@ def inspect_code(headers, cflags):
 def parse_json(path):
   header_files = []
 
-  with open(path, 'r') as stream:
+  with open(path) as stream:
     # Remove comments before loading the JSON.
     data = json.loads(re.sub(r'//.*\n', '', stream.read()))
 

tools/response_file.py

@@ -68,7 +68,7 @@ def read_response_file(response_filename):
     response_filename = response_filename[1:]
 
   if not os.path.exists(response_filename):
-    raise IOError("response file not found: %s" % response_filename)
+    raise OSError("response file not found: %s" % response_filename)
 
   # Guess encoding based on the file suffix
   components = os.path.basename(response_filename).split('.')

tools/shared.py

@@ -20,7 +20,7 @@
 import tempfile
 
 # We depend on python 3.8 features
-if sys.version_info < (3, 8):
+if sys.version_info < (3, 8): # noqa: UP036
   print(f'error: emscripten requires python 3.8 or above ({sys.executable} {sys.version})', file=sys.stderr)
   sys.exit(1)
 

tools/system_libs.py

@@ -736,7 +736,7 @@ def get_default_variation(cls, **kwargs):
 
   @classmethod
   def variations(cls):
-    combos = super(MTLibrary, cls).variations()
+    combos = super().variations()
 
     # These are mutually exclusive, only one flag will be set at any give time.
     return [combo for combo in combos if not combo['is_mt'] or not combo['is_ww']]
@@ -1406,7 +1406,7 @@ def can_use(self):
     # EMCC_FORCE_STDLIBS can have a similar effect of forcing all libraries.
     # In both cases, the build is not one that is hyper-focused on code size,
     # and so optz is not that important.
-    return super(libc_optz, self).can_use() and settings.SHRINK_LEVEL >= 2 and \
+    return super().can_use() and settings.SHRINK_LEVEL >= 2 and \
         not settings.LINKABLE and not os.environ.get('EMCC_FORCE_STDLIBS')
 
 
@@ -1420,7 +1420,7 @@ def get_files(self):
         filenames=['vfprintf.c'])
 
   def can_use(self):
-    return super(libprintf_long_double, self).can_use() and settings.PRINTF_LONG_DOUBLE
+    return super().can_use() and settings.PRINTF_LONG_DOUBLE
 
 
 class libwasm_workers(DebugLibrary):
@@ -1496,7 +1496,7 @@ def get_files(self):
       filenames=LIBC_SOCKETS)
 
   def can_use(self):
-    return super(libsockets, self).can_use() and not settings.PROXY_POSIX_SOCKETS
+    return super().can_use() and not settings.PROXY_POSIX_SOCKETS
 
 
 class libsockets_proxy(MTLibrary):
@@ -1508,7 +1508,7 @@ def get_files(self):
     return [utils.path_from_root('system/lib/websocket/websocket_to_posix_socket.c')]
 
   def can_use(self):
-    return super(libsockets_proxy, self).can_use() and settings.PROXY_POSIX_SOCKETS
+    return super().can_use() and settings.PROXY_POSIX_SOCKETS
 
 
 class crt1(MuslInternalLibrary):
@@ -2240,7 +2240,7 @@ def get_files(self):
     return files
 
   def can_use(self):
-    return super(libstandalonewasm, self).can_use() and settings.STANDALONE_WASM
+    return super().can_use() and settings.STANDALONE_WASM
 
 
 class libjsmath(Library):
@@ -2250,7 +2250,7 @@ class libjsmath(Library):
   src_files = ['jsmath.c']
 
   def can_use(self):
-    return super(libjsmath, self).can_use() and settings.JS_MATH
+    return super().can_use() and settings.JS_MATH
 
 
 class libstubs(DebugLibrary):

tools/wasm-sourcemap.py

@@ -313,10 +313,10 @@ def build_sourcemap(entries, code_section_offset, options):
       if collect_sources:
         load_name = prefixes.load.resolve(file_name)
         try:
-          with open(load_name, 'r') as infile:
+          with open(load_name) as infile:
             source_content = infile.read()
           sources_content.append(source_content)
-        except IOError:
+        except OSError:
           print('Failed to read source: %s' % load_name)
           sources_content.append(None)
     else:

tools/webidl_binder.py

@@ -2,6 +2,7 @@
 # Emscripten is available under two separate licenses, the MIT license and the
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
+# noqa: UP035
 
 """WebIDL binder