commit: 31cec19a1b976c59f8f958f86631bca0f99a5ec5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 8 19:49:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 8 19:49:21 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=31cec19a
gpkg: drop dead code (< Python 3.9 conditional) for subprocess
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/gpkg.py | 73 +++++++++++++++++------------------------------------
1 file changed, 23 insertions(+), 50 deletions(-)
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py
index 6ed2a6d00b..4b94853e4c 100644
--- a/lib/portage/gpkg.py
+++ b/lib/portage/gpkg.py
@@ -120,21 +120,13 @@ class tar_stream_writer:
if cmd is None:
self.proc = None
else:
- if sys.hexversion >= 0x03090000:
- self.proc = subprocess.Popen(
- cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- user=self.uid,
- group=self.gid,
- )
- else:
- self.proc = subprocess.Popen(
- cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- preexec_fn=self._drop_privileges,
- )
+ self.proc = subprocess.Popen(
+ cmd,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ user=self.uid,
+ group=self.gid,
+ )
self.read_thread = threading.Thread(
target=self._cmd_read_thread, name="tar_stream_cmd_read",
daemon=True
@@ -318,21 +310,13 @@ class tar_stream_reader:
self.proc = None
else:
# Start external decompressor
- if sys.hexversion >= 0x03090000:
- self.proc = subprocess.Popen(
- cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- user=self.uid,
- group=self.gid,
- )
- else:
- self.proc = subprocess.Popen(
- cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- preexec_fn=self._drop_privileges,
- )
+ self.proc = subprocess.Popen(
+ cmd,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ user=self.uid,
+ group=self.gid,
+ )
self.read_io = self.proc.stdout
# Start stdin block writing thread
self.thread = threading.Thread(
@@ -575,26 +559,15 @@ class checksum_helper:
)
gpg_verify_command = [x for x in gpg_verify_command if x != ""]
- if sys.hexversion >= 0x03090000:
- self.gpg_proc = subprocess.Popen(
- gpg_verify_command,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env=env,
- user=self.uid,
- group=self.gid,
- )
-
- else:
- self.gpg_proc = subprocess.Popen(
- gpg_verify_command,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env=env,
- preexec_fn=self._drop_privileges,
- )
+ self.gpg_proc = subprocess.Popen(
+ gpg_verify_command,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ env=env,
+ user=self.uid,
+ group=self.gid,
+ )
def __del__(self):
self.finish()
