Mark some function parameters as positional- or keyword-only

Author: Expertcoderz

userland/core/command.py

@@ -6,7 +6,7 @@
 
 
 class ExtendedOptionParser(OptionParserUsersMixin, OptionParser):
-    def __init__(self, usage: str | tuple[str, ...], **kwargs):
+    def __init__(self, /, usage: str | tuple[str, ...], **kwargs):
         super().__init__(
             usage="Usage: "
             + f"\n{7 * " "}".join(usage if isinstance(usage, tuple) else (usage,)),
@@ -20,7 +20,9 @@ def __init__(self, usage: str | tuple[str, ...], **kwargs):
             help="show usage information and exit",
         )
 
-    def expect_nargs(self, args: list[str], nargs: int | tuple[int] | tuple[int, int]):
+    def expect_nargs(
+        self, /, args: list[str], nargs: int | tuple[int] | tuple[int, int]
+    ):
         if isinstance(nargs, int):
             nargs = (nargs, nargs)
 
@@ -41,13 +43,15 @@ def expect_nargs(self, args: list[str], nargs: int | tuple[int] | tuple[int, int
 
 def command(parser: OptionParser | None = None):
     def create_utility(
-        func: Callable[[Values, list[str]], int],
+        func: Callable[[Values, list[str]], int], /
     ) -> Callable[[], None]:
         def execute_utility():
             try:
                 sys.exit(
-                func(*parser.parse_args()) if parser else func(Values(), sys.argv[1:])
-            )
+                    func(*parser.parse_args())
+                    if parser
+                    else func(Values(), sys.argv[1:])
+                )
             except KeyboardInterrupt:
                 print()
                 sys.exit(130)

userland/core/users.py

@@ -6,7 +6,7 @@
 
 
 class OptionParserUsersMixin(OptionParser):
-    def parse_owner_spec(self, owner_spec: str) -> tuple[int | None, int | None]:
+    def parse_owner_spec(self, owner_spec: str, /) -> tuple[int | None, int | None]:
         """
         Accept a string in the form ``[USER][:[GROUP]]`` and return the UID and GID.
         Either or both may be None if omitted from the input string.
@@ -26,7 +26,7 @@ def parse_owner_spec(self, owner_spec: str) -> tuple[int | None, int | None]:
         return uid, gid
 
     # pylint: disable=inconsistent-return-statements
-    def parse_user(self, user: str) -> int:
+    def parse_user(self, user: str, /) -> int:
         """
         Accept a string representing a username or UID and return the UID.
         An appropriate parser error is thrown if obtaining the UID fails.
@@ -40,7 +40,7 @@ def parse_user(self, user: str) -> int:
             self.error(f"invalid user: {user}")
 
     # pylint: disable=inconsistent-return-statements
-    def parse_group(self, group: str) -> int:
+    def parse_group(self, group: str, /) -> int:
         """
         Accept a string representing a group name or GID and return the GID.
         An appropriate parser error is thrown if obtaining the GID fails.
@@ -55,15 +55,15 @@ def parse_group(self, group: str) -> int:
 
 
 @functools.lru_cache(1000)
-def user_display_name_from_id(uid: int) -> str:
+def user_display_name_from_id(uid: int, /) -> str:
     try:
         return pwd.getpwuid(uid).pw_name
     except KeyError:
         return str(uid)
 
 
 @functools.lru_cache(1000)
-def group_display_name_from_id(gid: int) -> str:
+def group_display_name_from_id(gid: int, /) -> str:
     try:
         return grp.getgrgid(gid).gr_name
     except KeyError:

userland/utilities/factor.py

@@ -8,7 +8,7 @@
 SMALL_PRIMES = [3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47]
 
 
-def miller_rabin(n: int) -> bool:
+def miller_rabin(n: int, /) -> bool:
     """
     A deterministic version of the Miller-Rabin primality test.
     """
@@ -32,7 +32,7 @@ def miller_rabin(n: int) -> bool:
     return True
 
 
-def pollards_rho(n: int, step: int) -> int | None:
+def pollards_rho(n: int, /, step: int) -> int | None:
     """
     Pollard's rho algorithm for factorization.
 
@@ -49,7 +49,7 @@ def pollards_rho(n: int, step: int) -> int | None:
 
 
 def factorize(
-    n: int, cache: dict[int, int] = {p: p for p in SMALL_PRIMES}
+    n: int, /, *, cache: dict[int, int] = {p: p for p in SMALL_PRIMES}
 ) -> Generator[int]:
     """
     Generates prime factors of the integer n.
@@ -70,7 +70,7 @@ def factorize(
             else:
                 for i in range(1, n - 1):
                     if (factor := pollards_rho(n, i)) and factor != n:
-                        yield from factorize(min(n, factor), cache)
+                        yield from factorize(min(n, factor), cache=cache)
                         break
 
         if factor == n:
@@ -79,7 +79,7 @@ def factorize(
         n //= cast(int, factor)
 
 
-def format_exponents(factors: Iterable[int]) -> str:
+def format_exponents(factors: Iterable[int], /) -> str:
     processed: list[str] = []
 
     last_factor = 0