mypy/grub

rwx/grub/__init__.py

@@ -25,8 +25,8 @@ def make_image(
     pubkey_path: str | None = None,
 ) -> None:
     """Make a binary bootable image."""
-    args = [
+    args: list[str | tuple[str, ...]] = [
-        ("grub-mkimage",),
+        "grub-mkimage",
         ("--compress", COMPRESSION),
         ("--format", image_format),
         ("--output", image_path),
@@ -35,6 +35,6 @@ def make_image(
     if pubkey_path:
         args.append(("--pubkey", pubkey_path))
     args.extend(modules)
-    if modules := MODULES.get(image_format):
+    if extra_modules := MODULES.get(image_format):
-        args.extend(modules)
+        args.extend(extra_modules)
     ps.run(*args)

rwx/ps/__init__.py

@@ -9,10 +9,11 @@ def get_tuples_args(*items: str | tuple[str, ...]) -> list[str]:
     """Turn arguments tuples into an arguments list."""
     args: list[str] = []
     for item in items:
-        if type(item) is tuple:
+        match item:
-            args.extend(item)
+            case str():
-        else:
                 args.append(item)
+            case tuple():
+                args.extend(item)
     return args