treewide: Fix ruff reported issues

Author: dcbaker

subprojects/packagefiles/lame/libmp3lame/fix_def.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-import os
 import sys
 
 with open(sys.argv[1], 'r') as f:

subprojects/packagefiles/libffi/meson-scripts/test-unwind-section.py

@@ -2,7 +2,6 @@
 
 import os
 import sys
-import re
 import subprocess
 
 # Put output files in the builddir

subprojects/packagefiles/libuv/link_file_in_build_dir.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
-import os, sys
+import os
+import sys
 
 filename = sys.argv[1]
 linkname = sys.argv[2]

subprojects/packagefiles/m4/checks/m4_test_runner.py

@@ -1,16 +1,15 @@
 import sys
 import subprocess
 import os
-import tempfile
 
 # We want to print line endings normally, but each line should be a b'' string
 def clean(x):
     lines = []
-    for l in x.splitlines():
-        if b'examples' in l:
-            lines.append(str(l.replace(b'\\',b'/')))
+    for line in x.splitlines():
+        if b'examples' in line:
+            lines.append(str(line.replace(b'\\',b'/')))
         else:
-            lines.append(str(l))
+            lines.append(str(line))
     return '\n'.join(lines)
 
 def check_error(run_result,
@@ -45,29 +44,28 @@ def check_error(run_result,
 def main() -> int:
     m4_path = sys.argv[1]
     input_path = sys.argv[2]
-    tmproot = sys.argv[3]
-    workdir = sys.argv[4]
+    workdir = sys.argv[3]
     examples_path = workdir + '/examples'
     if ':' in examples_path:
         examples_path = examples_path.partition(':')[2]
-    with open(input_path, 'rb') as input_file, tempfile.TemporaryDirectory(dir=tmproot) as tmpdir:
+    with open(input_path, 'rb') as input_file:
         expected_out = bytes()
         expected_err = bytes()
         ignore_err = False
         m4_input = bytes()
-        for l in input_file.read().splitlines():
-            if l.startswith(b'dnl @ expected status: '):
-                expected_code = int(l[len('dnl @ expected status: '):].rstrip())
-            if l.startswith(b'dnl @ extra options: '):
-                args = l[len('dnl @ extra options: '):].rstrip().decode()
-            if l.startswith(b'dnl @result{}'):
-                expected_out += l[len('dnl @result{}'):] + os.linesep.encode()
-            if l.startswith(b'dnl @error{}'):
-                expected_err += l[len('dnl @error{}'):] + os.linesep.encode()
-            if l.startswith(b'dnl @ expected error: ignore'):
+        for line in input_file.read().splitlines():
+            if line.startswith(b'dnl @ expected status: '):
+                expected_code = int(line[len('dnl @ expected status: '):].rstrip())
+            if line.startswith(b'dnl @ extra options: '):
+                args = line[len('dnl @ extra options: '):].rstrip().decode()
+            if line.startswith(b'dnl @result{}'):
+                expected_out += line[len('dnl @result{}'):] + os.linesep.encode()
+            if line.startswith(b'dnl @error{}'):
+                expected_err += line[len('dnl @error{}'):] + os.linesep.encode()
+            if line.startswith(b'dnl @ expected error: ignore'):
                 ignore_err = True
-            if not l.startswith(b'dnl @'):
-                m4_input += l + b'\n'
+            if not line.startswith(b'dnl @'):
+                m4_input += line + b'\n'
         runargs = []
         runargs.append(m4_path)
         runargs.append('-d')

subprojects/packagefiles/m4/checks/meson.build

@@ -260,23 +260,23 @@ m4_path = m4.full_path()
 
 foreach file : checks
   test(file, py,
-       args: [m4_test, m4_path, files(file), meson.current_build_dir(), meson.project_source_root()],
+       args: [m4_test, m4_path, files(file), meson.project_source_root()],
        env: m4_env,
        depends: m4)
 endforeach
 
 if host_machine.system() != 'windows'
   foreach file : noparallel_checks
     test(file, py,
-         args: [m4_test, m4_path, files(file), meson.current_build_dir(), meson.project_source_root()],
+         args: [m4_test, m4_path, files(file), meson.project_source_root()],
          depends: m4,
          env: m4_env,
          is_parallel: false)
   endforeach
 
   foreach file : nowindows_checks
     test(file, py,
-         args: [m4_test, m4_path, files(file), meson.current_build_dir(), meson.project_source_root()],
+         args: [m4_test, m4_path, files(file), meson.project_source_root()],
          env: m4_env,
          depends: m4)
   endforeach

subprojects/packagefiles/openblas/gen_install_headers.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import argparse
+import re
 from pathlib import Path
 
 def write_openblas_config_header(dest_dir, version, config_last_path, template_path):
@@ -20,7 +21,7 @@ def write_openblas_config_header(dest_dir, version, config_last_path, template_p
                                 rest_of_line = " ".join(parts[1:]) if len(parts) > 1 else ""
                                 line_to_write = f"#define OPENBLAS_{macro_name} {rest_of_line}"
                                 f.write(f"{line_to_write.strip()}\n")
-       
+
 
         f.write(f'#define OPENBLAS_VERSION " OpenBLAS {version} "\n')
 
@@ -101,3 +102,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+

subprojects/packagefiles/sdl2/find-dylib-name.py

@@ -20,6 +20,7 @@
 import re
 import sys
 import pathlib
+import glob
 
 
 def verbose(*args):

subprojects/packagefiles/vo-aacenc/meson/makedef.py

@@ -127,7 +127,7 @@ def output(platform, symbols):
         # Substitute prefix out
         dump = [re.sub(f'\s+{prefix}', ' ', x) for x in dump]
         # Substitute big chonky spaces out
-        dump = [re.sub(f'\s+', ' ', x) for x in dump]
+        dump = [re.sub('\s+', ' ', x) for x in dump]
         # Exclude blank lines
         dump = [x for x in dump if len(x) > 0]
         # Take only the *second* field (split by spaces)

tools/fake_tty.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
-import os, pty, sys
+import os
+import pty
+import sys
 
 os.environ['TERM'] = 'xterm-256color'
 exit(os.waitstatus_to_exitcode(pty.spawn(sys.argv[1:])))

tools/import-wraps.py

@@ -40,7 +40,7 @@ def get_wrap_info(wrap: str) -> T.List[T.Tuple[str, str]]:
             version, revision = line.split()
             versions.append((version, revision))
     except subprocess.CalledProcessError:
-       pass
+        pass
     return versions
 
 def rewrite_wrap(wrap: str):

tools/sanity_checks.py

@@ -52,8 +52,8 @@
         'glbinding-aux_export.h'
     ],
     'godot-cpp' : [
-         'meson-bindings-generator.py',
-     ],
+        'meson-bindings-generator.py',
+    ],
     'gumbo-parser': [
         'tokenizer.cc',
     ],

tools/utils.py

@@ -121,7 +121,7 @@ def is_linux() -> bool:
     return platform.system().lower() == 'linux'
 
 def is_windows() -> bool:
-    return platform.system().lower() == 'windows' and not "MSYSTEM" in os.environ
+    return platform.system().lower() == 'windows' and "MSYSTEM" not in os.environ
 
 def is_msys() -> bool:
     return platform.system().lower() == 'windows' and "MSYSTEM" in os.environ