Improve types of diff.py

Yobmod · Yobmod · commit 2a6a2e2e44b6 · 2021-07-06T14:45:30.000+01:00
diff --git a/git/diff.py b/git/diff.py
@@ -26,8 +26,13 @@
 
 Lit_change_type = Literal['A', 'D', 'M', 'R', 'T']
 
+
+def is_change_type(inp: str) -> TypeGuard[Lit_change_type]:
+    return inp in Lit_change_type.__args__  # type: ignore
+
 # ------------------------------------------------------------------------
 
+
 __all__ = ('Diffable', 'DiffIndex', 'Diff', 'NULL_TREE')
 
 # Special object to compare against the empty tree in diffs
@@ -503,13 +508,10 @@ def _handle_diff_line(lines_bytes: bytes, repo: 'Repo', index: DiffIndex) -> Non
             a_blob_id: Union[str, None]
             b_blob_id: Union[str, None]
             old_mode, new_mode, a_blob_id, b_blob_id, _change_type = meta.split(None, 4)
-            # Change type can be R100
+            # _Change_type can be R100
             # R: status letter
             # 100: score (in case of copy and rename)
 
-            def is_change_type(inp: str) -> TypeGuard[Lit_change_type]:
-                return inp in Lit_change_type.__args__  # type: ignore
-
             assert is_change_type(_change_type[0])
             change_type: Lit_change_type = _change_type[0]
             score_str = ''.join(_change_type[1:])
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -47,6 +47,7 @@
     find_first_remote_branch
 )
 
+from git.repo import Repo
 
 # typing ----------------------------------------------------------------------
 from typing import Callable, Dict, Mapping, Sequence, TYPE_CHECKING
@@ -55,7 +56,6 @@
 from git.types import Commit_ish, PathLike, TBD
 
 if TYPE_CHECKING:
-    from git.repo import Repo
     from git.index import IndexFile
 
 
