Enable UP ruff checks and fix resulting warnings. NFC (emscripten-core#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