From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 16 Jul 2023 17:57:54 +0000 (+0200)
Subject: Remove kwargs argument from run() and spawn()
X-Git-Tag: v15~76^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08b08446e2b88b052701b5e656778f7465f4f082;p=thirdparty%2Fmkosi.git

Remove kwargs argument from run() and spawn()

Let's prefer listing arguments explicitly so that mypy can catch
the wrong ones easily.
---

diff --git a/mkosi/run.py b/mkosi/run.py
index dc2e3c756..d9654e3aa 100644
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -224,9 +224,9 @@ def run(
     stdout: _FILE = None,
     stderr: _FILE = None,
     input: Optional[str] = None,
+    text: bool = True,
     env: Mapping[str, PathString] = {},
     log: bool = True,
-    **kwargs: Any,
 ) -> CompletedProcess:
     if ARG_DEBUG.get():
         logging.info(f"+ {' '.join(str(s) for s in cmdline)}")
@@ -254,15 +254,17 @@ def run(
         stdin = subprocess.DEVNULL
 
     try:
-        return subprocess.run(cmdline,
-                              check=check,
-                              stdin=stdin,
-                              stdout=stdout,
-                              stderr=stderr,
-                              input=input,
-                              env=env,
-                              **kwargs,
-                              preexec_fn=foreground)
+        return subprocess.run(
+            cmdline,
+            check=check,
+            stdin=stdin,
+            stdout=stdout,
+            stderr=stderr,
+            input=input,
+            text=True,
+            env=env,
+            preexec_fn=foreground,
+        )
     except FileNotFoundError:
         die(f"{cmdline[0]} not found in PATH.")
     except subprocess.CalledProcessError as e:
@@ -275,9 +277,10 @@ def run(
 
 def spawn(
     cmdline: Sequence[PathString],
+    stdin: _FILE = None,
     stdout: _FILE = None,
     stderr: _FILE = None,
-    **kwargs: Any,
+    text: bool = True,
 ) -> Popen:
     if ARG_DEBUG.get():
         logging.info(f"+ {' '.join(str(s) for s in cmdline)}")
@@ -289,7 +292,14 @@ def spawn(
         stdout = sys.stderr
 
     try:
-        return subprocess.Popen(cmdline, stdout=stdout, stderr=stderr, **kwargs, preexec_fn=foreground)
+        return subprocess.Popen(
+            cmdline,
+            stdin=stdin,
+            stdout=stdout,
+            stderr=stderr,
+            text=text,
+            preexec_fn=foreground,
+        )
     except FileNotFoundError:
         die(f"{cmdline[0]} not found in PATH.")
     except subprocess.CalledProcessError as e: