Use capture_output instead of 2x subprocess.PIPE

They are equivalent but the former is shorter: https://docs.python.org/3/library/subprocess.html#subprocess.run Signed-off-by: Lukas Puehringer <[email protected]>
secure-systems-lab · Feb 10, 2023 · f23d800 · f23d800
1 parent b03f127
commit f23d800
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/securesystemslib/gpg/constants.py b/securesystemslib/gpg/constants.py
@@ -34,8 +34,7 @@ def is_available_gnupg(gnupg: str, timeout=GPG_TIMEOUT) -> bool:
     try:
         subprocess.run(  # nosec
             gpg_version_cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            capture_output=True,
             timeout=timeout,
             check=True,
         )

diff --git a/securesystemslib/gpg/functions.py b/securesystemslib/gpg/functions.py
@@ -130,8 +130,7 @@ def create_signature(content, keyid=None, homedir=None, timeout=GPG_TIMEOUT):
         command,
         input=content,
         check=False,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
         timeout=timeout,
     )
 
@@ -316,8 +315,7 @@ def export_pubkey(keyid, homedir=None, timeout=GPG_TIMEOUT):
     command = gpg_export_pubkey_command(keyid=keyid, homearg=homearg)
     gpg_process = subprocess.run(  # nosec
         command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
         timeout=timeout,
         check=True,
     )

diff --git a/tests/test_gpg.py b/tests/test_gpg.py
@@ -221,8 +221,7 @@ def setUpClass(self):  # pylint: disable=bad-classmethod-argument
         cmd = gpg_export_pubkey_command(keyid=keyid, homearg=homearg)
         proc = subprocess.run(
             cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            capture_output=True,
             timeout=GPG_TIMEOUT,
             check=True,
         )
@@ -234,8 +233,7 @@ def setUpClass(self):  # pylint: disable=bad-classmethod-argument
         cmd = gpg_export_pubkey_command(keyid=keyid, homearg=homearg)
         proc = subprocess.run(
             cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            capture_output=True,
             timeout=GPG_TIMEOUT,
             check=True,
         )