fixup! Use subprocess's timeout feature instead of reinventing the wheel

Author: ngie-eign

git/cmd.py

@@ -20,7 +20,7 @@
 import threading
 import warnings
 
-from git.compat import defenc, force_bytes, safe_decode
+from git.compat import defenc, safe_decode
 from git.exc import (
     CommandError,
     GitCommandError,
@@ -109,7 +109,7 @@ def handle_process_output(
     stderr_handler: Union[None, Callable[[AnyStr], None], Callable[[List[AnyStr]], None]],
     finalizer: Union[None, Callable[[Union[Popen, "Git.AutoInterrupt"]], None]] = None,
     decode_streams: bool = True,
-    kill_after_timeout: float | int | None = None,
+    kill_after_timeout: float | None = None,
 ) -> None:
     R"""Register for notifications to learn that process output is ready to read, and
     dispatch lines to the respective line handlers.
@@ -335,7 +335,7 @@ def __init__(
         self,
         proc: subprocess.Popen | None,
         args: Any,
-        timeout: float | int | None = None,
+        timeout: float | None = None,
     ) -> None:
         self.proc = proc
         self.args = args
@@ -387,47 +387,6 @@ def __del__(self) -> None:
     def __getattr__(self, attr: str) -> Any:
         return getattr(self.proc, attr)
 
-    # TODO: Bad choice to mimic `proc.wait()` but with different args.
-    def wait(self, stderr: Union[None, str, bytes] = b"") -> int:
-        """Wait for the process and return its status code.
-
-        :param stderr:
-            Previously read value of stderr, in case stderr is already closed.
-
-        :warn:
-            May deadlock if output or error pipes are used and not handled separately.
-
-        :raise git.exc.GitCommandError:
-            If the return status is not 0.
-        """
-        if stderr is None:
-            stderr_b = b""
-        stderr_b = force_bytes(data=stderr, encoding="utf-8")
-        status: Union[int, None]
-        if self.proc is not None:
-            status = self.proc.wait(timeout=self.timeout)
-            p_stderr = self.proc.stderr
-        else:  # Assume the underlying proc was killed earlier or never existed.
-            status = self.status
-            p_stderr = None
-
-        def read_all_from_possibly_closed_stream(stream: Union[IO[bytes], None]) -> bytes:
-            if stream:
-                try:
-                    return stderr_b + force_bytes(stream.read())
-                except (OSError, ValueError):
-                    return stderr_b or b""
-            else:
-                return stderr_b or b""
-
-        # END status handling
-
-        if status != 0:
-            errstr = read_all_from_possibly_closed_stream(p_stderr)
-            _logger.debug("AutoInterrupt wait stderr: %r" % (errstr,))
-            raise GitCommandError(remove_password_if_present(self.args), status, errstr)
-        return status
-
 
 _AutoInterrupt.__name__ = "AutoInterrupt"
 _AutoInterrupt.__qualname__ = "Git.AutoInterrupt"
@@ -1111,7 +1070,7 @@ def execute(
         as_process: bool = False,
         output_stream: Union[None, BinaryIO] = None,
         stdout_as_string: bool = True,
-        kill_after_timeout: float | int | None = None,
+        kill_after_timeout: float | None = None,
         with_stdout: bool = True,
         universal_newlines: bool = False,
         shell: Union[None, bool] = None,