Make bytesIO forwardref

Yobmod · Yobmod · commit c2317a768f4d · 2021-07-05T18:47:44.000+01:00
diff --git a/git/config.py b/git/config.py
@@ -275,7 +275,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje
     # list of RawConfigParser methods able to change the instance
     _mutating_methods_ = ("add_section", "remove_section", "remove_option", "set")
 
-    def __init__(self, file_or_files: Union[None, PathLike, BytesIO, Sequence[Union[PathLike, BytesIO]]] = None,
+    def __init__(self, file_or_files: Union[None, PathLike, 'BytesIO', Sequence[Union[PathLike, 'BytesIO']]] = None,
                  read_only: bool = True, merge_includes: bool = True,
                  config_level: Union[Lit_config_levels, None] = None,
                  repo: Union['Repo', None] = None) -> None:
@@ -667,7 +667,7 @@ def write(self) -> None:
         fp = self._file_or_files
 
         # we have a physical file on disk, so get a lock
-        is_file_lock = isinstance(fp, (str, IOBase))  # can't use Pathlike until 3.5 dropped
+        is_file_lock = isinstance(fp, (str, os.PathLike, IOBase))  # can't use Pathlike until 3.5 dropped
         if is_file_lock and self._lock is not None:  # else raise Error?
             self._lock._obtain_lock()
 
@@ -676,7 +676,7 @@ def write(self) -> None:
             with open(fp, "wb") as fp_open:
                 self._write(fp_open)
         else:
-            fp = cast(BytesIO, fp)
+            fp = cast('BytesIO', fp)
             fp.seek(0)
             # make sure we do not overwrite into an existing file
             if hasattr(fp, 'truncate'):
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -392,7 +392,7 @@ def add(cls, repo: 'Repo', name: str, path: PathLike, url: Union[str, None] = No
         if sm.exists():
             # reretrieve submodule from tree
             try:
-                sm = repo.head.commit.tree[path]
+                sm = repo.head.commit.tree[str(path)]
                 sm._name = name
                 return sm
             except KeyError:
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py
@@ -10,6 +10,15 @@
 
 import logging
 
+# typing -------------------------------------------------------------------
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from git.repo import Repo
+
+# ----------------------------------------------------------------------------
+
 __all__ = ["RootModule", "RootUpdateProgress"]
 
 log = logging.getLogger('git.objects.submodule.root')
@@ -42,7 +51,7 @@ class RootModule(Submodule):
 
     k_root_name = '__ROOT__'
 
-    def __init__(self, repo):
+    def __init__(self, repo: 'Repo'):
         # repo, binsha, mode=None, path=None, name = None, parent_commit=None, url=None, ref=None)
         super(RootModule, self).__init__(
             repo,
@@ -55,7 +64,7 @@ def __init__(self, repo):
             branch_path=git.Head.to_full_path(self.k_head_default)
         )
 
-    def _clear_cache(self):
+    def _clear_cache(self) -> None:
         """May not do anything"""
         pass
 
@@ -343,7 +352,7 @@ def update(self, previous_commit=None, recursive=True, force_remove=False, init=
 
         return self
 
-    def module(self):
+    def module(self) -> 'Repo':
         """:return: the actual repository containing the submodules"""
         return self.repo
     #} END interface
diff --git a/git/refs/head.py b/git/refs/head.py
@@ -5,9 +5,13 @@
 from .symbolic import SymbolicReference
 from .reference import Reference
 
-from typing import Union
+from typing import Union, TYPE_CHECKING
+
 from git.types import Commit_ish
 
+if TYPE_CHECKING:
+    from git.repo import Repo
+
 __all__ = ["HEAD", "Head"]
 
 
@@ -25,12 +29,13 @@ class HEAD(SymbolicReference):
     _ORIG_HEAD_NAME = 'ORIG_HEAD'
     __slots__ = ()
 
-    def __init__(self, repo, path=_HEAD_NAME):
+    def __init__(self, repo: 'Repo', path=_HEAD_NAME):
         if path != self._HEAD_NAME:
             raise ValueError("HEAD instance must point to %r, got %r" % (self._HEAD_NAME, path))
         super(HEAD, self).__init__(repo, path)
+        self.commit: 'Commit_ish'
 
-    def orig_head(self):
+    def orig_head(self) -> 'SymbolicReference':
         """
         :return: SymbolicReference pointing at the ORIG_HEAD, which is maintained
             to contain the previous value of HEAD"""
