pmb, tests: Enable Refurb checks

Simplifies some code.

pmb/aportgen/busybox_static.py

@@ -67,7 +67,6 @@ def generate(pkgname: str) -> None:
                 rm .PKGINFO .SIGN.*
             }}
         """
-        for line in apkbuild.split("\n"):
+        handle.writelines(line[12:].replace(" " * 4, "\t") + "\n" for line in apkbuild.split("\n"))
-            handle.write(line[12:].replace(" " * 4, "\t") + "\n")
 
     pmb.aportgen.core.generate_checksums(tempdir, apkbuild_path)

pmb/aportgen/core.py

@@ -106,7 +106,7 @@ def rewrite(
     path = get_context().config.work / "aportgen/APKBUILD"
     with open(path, "r+", encoding="utf-8") as handle:
         skip_in_func = False
-        for line in handle.readlines():
+        for line in handle:
             # Skip maintainer/contributor
             if line.startswith(("# Maintainer", "# Contributor")):
                 continue

pmb/aportgen/device.py

@@ -248,8 +248,7 @@ def generate_deviceinfo(
     pmb.helpers.run.user(["mkdir", "-p", work / "aportgen"])
     path = work / "aportgen/deviceinfo"
     with open(path, "w", encoding="utf-8") as handle:
-        for line in content.rstrip().split("\n"):
+        handle.writelines(line.lstrip() + "\n" for line in content.rstrip().split("\n"))
-            handle.write(line.lstrip() + "\n")
 
 
 def generate_modules_initfs() -> None:
@@ -270,8 +269,7 @@ def generate_modules_initfs() -> None:
     pmb.helpers.run.user(["mkdir", "-p", work / "aportgen"])
     path = work / "aportgen/modules-initfs"
     with open(path, "w", encoding="utf-8") as handle:
-        for line in content.rstrip().split("\n"):
+        handle.writelines(line.lstrip() + "\n" for line in content.rstrip().split("\n"))
-            handle.write(line.lstrip() + "\n")
 
 
 def generate_apkbuild(pkgname: str, name: str, arch: Arch, flash_method: str) -> None:
@@ -320,8 +318,9 @@ def generate_apkbuild(pkgname: str, name: str, arch: Arch, flash_method: str) ->
     pmb.helpers.run.user(["mkdir", "-p", work / "aportgen"])
     path = work / "aportgen/APKBUILD"
     with open(path, "w", encoding="utf-8") as handle:
-        for line in content.rstrip().split("\n"):
+        handle.writelines(
-            handle.write(line[8:].replace(" " * 4, "\t") + "\n")
+            line[8:].replace(" " * 4, "\t") + "\n" for line in content.rstrip().split("\n")
+        )
 
 
 def generate(pkgname: str) -> None:

pmb/aportgen/grub_efi.py

@@ -56,7 +56,6 @@ def generate(pkgname: str) -> None:
                 rm .PKGINFO .SIGN.*
             }}
         """
-        for line in apkbuild.split("\n"):
+        handle.writelines(line[12:].replace(" " * 4, "\t") + "\n" for line in apkbuild.split("\n"))
-            handle.write(line[12:].replace(" " * 4, "\t") + "\n")
 
     pmb.aportgen.core.generate_checksums(tempdir, apkbuild_path)

pmb/aportgen/musl.py

@@ -91,7 +91,6 @@ def generate(pkgname: str) -> None:
                 done
             }}
         """
-        for line in apkbuild.split("\n"):
+        handle.writelines(line[12:].replace(" " * 4, "\t") + "\n" for line in apkbuild.split("\n"))
-            handle.write(line[12:].replace(" " * 4, "\t") + "\n")
 
     pmb.aportgen.core.generate_checksums(tempdir, apkbuild_path)

pmb/build/backend.py

@@ -109,8 +109,7 @@ def override_source(
 
     # Write and log append file
     with open(append_path_outside, "w", encoding="utf-8") as handle:
-        for line in append.split("\n"):
+        handle.writelines(line[13:].replace(" " * 4, "\t") + "\n" for line in append.split("\n"))
-            handle.write(line[13:].replace(" " * 4, "\t") + "\n")
     pmb.chroot.user(["cat", append_path], chroot)
 
     # Append it to the APKBUILD

pmb/config/init.py

@@ -367,8 +367,7 @@ def ask_for_provider_select(apkbuild: dict[str, Any], providers_cfg: dict[str, s
         for pkgname, pkg in providers:
             # Strip provider prefix if possible
             short = pkgname
-            if short.startswith(f"{select}-"):
+            short = short.removeprefix(f"{select}-")
-                short = short[len(f"{select}-") :]
 
             # Allow selecting the package using both short and long name
             providers_short[pkgname] = pkgname

pmb/config/pmaports.py

@@ -138,9 +138,7 @@ def read_config(
 
 def all_channels() -> list[str]:
     """Get a list of all channels for all pkgrepos."""
-    ret = set()
+    ret = {read_config(repo)["channel"] for repo in pkgrepo_paths()}
-    for repo in pkgrepo_paths():
-        ret.add(read_config(repo)["channel"])
 
     logging.verbose(f"all_chanels: {ret}")
     return list(ret)

pmb/helpers/aportupgrade.py

@@ -34,8 +34,7 @@ GITLAB_HOSTS = [
 
 
 def init_req_headers() -> None:
-    global req_headers
+    global req_headers, req_headers_github
-    global req_headers_github
     # Only initialize them once
     if req_headers and req_headers_github:
         return

pmb/parse/kconfig.py

@@ -24,7 +24,7 @@ def is_set(config: str, option: str) -> bool:
     :param option: name of the option to check, e.g. EXT4_FS
     :returns: True if the check passed, False otherwise
     """
-    return re.search("^CONFIG_" + option + "=[ym]$", config, re.M) is not None
+    return re.search("^CONFIG_" + option + "=[ym]$", config, re.MULTILINE) is not None
 
 
 def is_set_str(config: str, option: str, string: str) -> bool:
@@ -36,7 +36,7 @@ def is_set_str(config: str, option: str, string: str) -> bool:
     :param string: the expected string
     :returns: True if the check passed, False otherwise
     """
-    match = re.search("^CONFIG_" + option + '="(.*)"$', config, re.M)
+    match = re.search("^CONFIG_" + option + '="(.*)"$', config, re.MULTILINE)
     if match:
         return string == match.group(1)
     else:
@@ -52,7 +52,7 @@ def is_in_array(config: str, option: str, string: str) -> bool:
     :param string: the string expected to be an element of the array
     :returns: True if the check passed, False otherwise
     """
-    match = re.search("^CONFIG_" + option + '="(.*)"$', config, re.M)
+    match = re.search("^CONFIG_" + option + '="(.*)"$', config, re.MULTILINE)
     if match:
         values = match.group(1).split(",")
         return string in values

pyproject.toml

@@ -34,12 +34,13 @@ line-length=100
 target-version = "py310"
 
 [tool.ruff.lint]
+# FURB101, FURB103: Easier to do if str gets replaced with Path in more places.
 # PERF203: Negligible performance improvement on Python 3.11 and newer, and
 #          not worth the required rework.
 # RUF021: Could be fixed if someone cares about this.
 # RUF052: Needs a lot of changes, feel free to fix and then remove this ignore.
-extend-ignore = ["PERF203", "RUF021", "RUF052"]
+extend-ignore = ["FURB101", "FURB103", "PERF203", "RUF021", "RUF052"]
-extend-select = ["CPY001", "N", "PERF", "PIE", "RUF", "UP"]
+extend-select = ["CPY001", "FURB", "N", "PERF", "PIE", "RUF", "UP"]
 preview = true
 
 [tool.ruff.format]

test/parse/test_deviceinfo.py

@@ -178,8 +178,7 @@ def random_valid_deviceinfo(tmp_path):
 
     # Now write it all out to a file
     with open(path, "w") as f:
-        for key, value in info.items():
+        f.writelines(f'deviceinfo_{key}="{value}"\n' for key, value in info.items())
-            f.write(f'deviceinfo_{key}="{value}"\n')
 
     return path