Make subodule a forward ref in Index.base

Yobmod · Yobmod · commit 06eca0b84a45 · 2021-07-06T16:47:39.000+01:00
diff --git a/git/index/base.py b/git/index/base.py
@@ -22,7 +22,6 @@
 )
 from git.objects import (
     Blob,
-    Submodule,
     Tree,
     Object,
     Commit,
@@ -76,6 +75,7 @@
     from git.repo import Repo
     from git.refs.reference import Reference
     from git.util import Actor
+    from git.objects.submodule.base import Submodule
 
 
 StageType = int
@@ -842,7 +842,7 @@ def _items_to_rela_paths(self, items):
             items = [items]
 
         for item in items:
-            if isinstance(item, (BaseIndexEntry, (Blob, Submodule))):
+            if isinstance(item, (BaseIndexEntry, (Blob, 'Submodule'))):
                 paths.append(self._to_relative_path(item.path))
             elif isinstance(item, str):
                 paths.append(self._to_relative_path(item))
@@ -853,7 +853,7 @@ def _items_to_rela_paths(self, items):
 
     @post_clear_cache
     @default_index
-    def remove(self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, Submodule]], working_tree: bool = False,
+    def remove(self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, 'Submodule']], working_tree: bool = False,
                **kwargs: Any) -> List[str]:
         """Remove the given items from the index and optionally from
         the working tree as well.
@@ -905,7 +905,7 @@ def remove(self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, Submodule
 
     @post_clear_cache
     @default_index
-    def move(self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, Submodule]], skip_errors: bool = False,
+    def move(self, items: Sequence[Union[PathLike, Blob, BaseIndexEntry, 'Submodule']], skip_errors: bool = False,
              **kwargs: Any) -> List[Tuple[str, str]]:
         """Rename/move the items, whereas the last item is considered the destination of
         the move operation. If the destination is a file, the first item ( of two )
