Mak EntryTup a froward ref

Yobmod · Yobmod · commit 1533596b03ef · 2021-07-08T22:20:59.000+01:00
diff --git a/git/index/fun.py b/git/index/fun.py
@@ -57,7 +57,11 @@
 
 if TYPE_CHECKING:
     from .base import IndexFile
-    from git.objects.fun import EntryTup
+    from git.objects.fun import EntryTupOrNone
+
+
+def is_three_entry_list(inp) -> TypeGuard[List['EntryTupOrNone']]:
+    return isinstance(inp, list) and len(inp) == 3
 
 # ------------------------------------------------------------------------------------
 
@@ -334,11 +338,6 @@ def aggressive_tree_merge(odb, tree_shas: Sequence[bytes]) -> List[BaseIndexEntr
     if len(tree_shas) > 3:
         raise ValueError("Cannot handle %i trees at once" % len(tree_shas))
 
-    EntryTupOrNone = Union[EntryTup, None]
-
-    def is_three_entry_list(inp) -> TypeGuard[List[EntryTupOrNone]]:
-        return isinstance(inp, list) and len(inp) == 3
-
     # three trees
     for three_entries in traverse_trees_recursive(odb, tree_shas, ''):
 
diff --git a/git/objects/fun.py b/git/objects/fun.py
@@ -16,7 +16,7 @@
     from git import GitCmdObjectDB
 
 EntryTup = Tuple[bytes, int, str]  # same as TreeCacheTup in tree.py
-
+EntryTupOrNone = Union[EntryTup, None]
 
 # ---------------------------------------------------
 
