!squash more

Author: tony

src/libvcs/_internal/run.py

@@ -237,21 +237,15 @@ def progress_cb(output: t.AnyStr, timestamp: datetime.datetime) -> None:
         callback(output="\r", timestamp=datetime.datetime.now())
 
     # Read full stdout lines after process finishes
-    if proc.stdout is not None:
-        raw_stdout = proc.stdout.readlines()
-    else:
-        raw_stdout = []
+    raw_stdout = proc.stdout.readlines() if proc.stdout is not None else []
 
     lines: t.Iterator[str] = (ln.strip() for ln in raw_stdout if ln.strip())
     # Join lines with newlines, then decode
     all_output = console_to_str(b"\n".join(ln.encode() for ln in lines))
 
     # If return code is non-zero, read stderr lines and override all_output
     if code:
-        if proc.stderr is not None:
-            raw_stderr = proc.stderr.readlines()
-        else:
-            raw_stderr = []
+        raw_stderr = proc.stderr.readlines() if proc.stderr is not None else []
 
         stderr_lines: t.Iterator[str] = (ln.strip() for ln in raw_stderr if ln.strip())
         all_output = console_to_str(b"".join(ln.encode() for ln in stderr_lines))

src/libvcs/_internal/subprocess.py

@@ -258,7 +258,7 @@ def Popen(
         args: _CMD | None = ...,
         universal_newlines: t.Literal[False] = ...,
         *,
-        text: t.Literal[None, False] = ...,
+        text: t.Literal[False] | None = ...,
         encoding: None = ...,
         errors: None = ...,
     ) -> subprocess.Popen[bytes]: ...
@@ -370,7 +370,7 @@ def check_output(
         input: str | bytes | None = ...,
         encoding: None = ...,
         errors: None = ...,
-        text: t.Literal[None, False] = ...,
+        text: t.Literal[False] | None = ...,
         **kwargs: t.Any,
     ) -> bytes: ...
 
@@ -484,7 +484,7 @@ def run(
         encoding: None = ...,
         errors: None = ...,
         input: bytes | None = ...,
-        text: t.Literal[None, False] = ...,
+        text: t.Literal[False] | None = ...,
     ) -> subprocess.CompletedProcess[bytes]: ...
 
     def run(