Address review feedback and restore CI compatibility

The Python package workflow failed during import on Python 3.7 and 3.8 because subprocess.Popen was subscripted in an eagerly evaluated annotation. It also reported mypy errors caused by the invariant IterableList type variable and an overly narrow IndexFileSHA1Writer stream type; lint reported an unused IO import.

Quote review feedback: IterableList variance no longer matched its subtype comment; the shutil.rmtree callback was narrower than the typeshed contract; and expand_path overloads omitted None and pathlib.Path results and did not handle Path.resolve exceptions consistently.

Restore covariance and the IO[bytes] stream type, quote the Popen annotation for old Python runtimes, correct rmtree callback types, and make expand_path return and exception behavior match the implementation. Update the cwd annotation that now correctly flows from expand_path. This addresses the review feedback and restores the lint and mypy checks.

Author: codex

git/cmd.py

@@ -1358,7 +1358,7 @@ def execute(
 
         # Allow the user to have the command executed in their working dir.
         try:
-            cwd = self._working_dir or os.getcwd()  # type: Union[None, str]
+            cwd = self._working_dir or os.getcwd()  # type: Optional[PathLike]
             if not os.access(str(cwd), os.X_OK):
                 cwd = None
         except FileNotFoundError:

git/util.py

@@ -106,7 +106,7 @@
 
 # ---------------------------------------------------------------------
 
-T_IterableObj = TypeVar("T_IterableObj", bound=Union["IterableObj", "Has_id_attribute"])
+T_IterableObj = TypeVar("T_IterableObj", bound=Union["IterableObj", "Has_id_attribute"], covariant=True)
 # So IterableList[Head] is subtype of IterableList[IterableObj].
 
 _logger = logging.getLogger(__name__)
@@ -217,7 +217,7 @@ def rmtree(path: PathLike) -> None:
         couldn't be deleted are read-only. Windows will not remove them in that case.
     """
 
-    def handler(function: Callable[[PathLike], Any], path: PathLike, _excinfo: Any) -> None:
+    def handler(function: Callable[[str], Any], path: str, _excinfo: Any) -> None:
         """Callback for :func:`shutil.rmtree`.
 
         This works as either a ``onexc`` or ``onerror`` style callback.
@@ -508,7 +508,7 @@ def get_user_id() -> str:
     return "%s@%s" % (getpass.getuser(), platform.node())
 
 
-def finalize_process(proc: Union[subprocess.Popen[Any], "Git.AutoInterrupt"], **kwargs: Any) -> None:
+def finalize_process(proc: Union["subprocess.Popen[Any]", "Git.AutoInterrupt"], **kwargs: Any) -> None:
     """Wait for the process (clone, fetch, pull or push) and handle its errors
     accordingly."""
     # TODO: No close proc-streams??
@@ -520,17 +520,17 @@ def expand_path(p: None, expand_vars: bool = ...) -> None: ...
 
 
 @overload
-def expand_path(p: PathLike, expand_vars: bool = ...) -> str:
+def expand_path(p: PathLike, expand_vars: bool = ...) -> Optional[PathLike]:
     # TODO: Support for Python 3.5 has been dropped, so these overloads can be improved.
     ...
 
 
 def expand_path(p: Union[None, PathLike], expand_vars: bool = True) -> Optional[PathLike]:
     if p is None:
         return None
-    if isinstance(p, Path):
-        return p.resolve()
     try:
+        if isinstance(p, Path):
+            return p.resolve()
         expanded_path = osp.expanduser(os.fspath(p))
         if expand_vars:
             expanded_path = osp.expandvars(expanded_path)
@@ -986,7 +986,7 @@ class IndexFileSHA1Writer:
 
     __slots__ = ("f", "sha1")
 
-    def __init__(self, f: BinaryIO) -> None:
+    def __init__(self, f: IO[bytes]) -> None:
         self.f = f
         self.sha1 = make_sha(b"")