Improve relative order of import groups, and __all__, in git.index

git/index/base.py

@@ -19,6 +19,9 @@
 import sys
 import tempfile
 
+from gitdb.base import IStream
+from gitdb.db import MemoryDB
+
 from git.compat import defenc, force_bytes
 import git.diff as git_diff
 from git.exc import CheckoutError, GitCommandError, GitError, InvalidGitRepositoryError
@@ -33,8 +36,6 @@
     unbare_repo,
     to_bin_sha,
 )
-from gitdb.base import IStream
-from gitdb.db import MemoryDB
 
 from .fun import (
     S_IFGITLINK,

git/index/fun.py

@@ -4,22 +4,28 @@
 """Standalone functions to accompany the index implementation and make it more
 versatile."""
 
+__all__ = (
+    "write_cache",
+    "read_cache",
+    "write_tree_from_cache",
+    "entry_key",
+    "stat_mode_to_index_mode",
+    "S_IFGITLINK",
+    "run_commit_hook",
+    "hook_path",
+)
+
 from io import BytesIO
 import os
 import os.path as osp
 from pathlib import Path
-from stat import (
-    S_IFDIR,
-    S_IFLNK,
-    S_ISLNK,
-    S_ISDIR,
-    S_IFMT,
-    S_IFREG,
-    S_IXUSR,
-)
+from stat import S_IFDIR, S_IFLNK, S_IFMT, S_IFREG, S_ISDIR, S_ISLNK, S_IXUSR
 import subprocess
 import sys
 
+from gitdb.base import IStream
+from gitdb.typ import str_tree_type
+
 from git.cmd import handle_process_output, safer_popen
 from git.compat import defenc, force_bytes, force_text, safe_decode
 from git.exc import HookExecutionError, UnmergedEntriesError
@@ -29,8 +35,6 @@
     tree_to_stream,
 )
 from git.util import IndexFileSHA1Writer, finalize_process
-from gitdb.base import IStream
-from gitdb.typ import str_tree_type
 
 from .typ import BaseIndexEntry, IndexEntry, CE_NAMEMASK, CE_STAGESHIFT
 from .util import pack, unpack
@@ -42,31 +46,18 @@
 from git.types import PathLike
 
 if TYPE_CHECKING:
-    from .base import IndexFile
     from git.db import GitCmdObjectDB
     from git.objects.tree import TreeCacheTup
 
-    # from git.objects.fun import EntryTupOrNone
+    from .base import IndexFile
 
 # ------------------------------------------------------------------------------------
 
-
 S_IFGITLINK = S_IFLNK | S_IFDIR
 """Flags for a submodule."""
 
 CE_NAMEMASK_INV = ~CE_NAMEMASK
 
-__all__ = (
-    "write_cache",
-    "read_cache",
-    "write_tree_from_cache",
-    "entry_key",
-    "stat_mode_to_index_mode",
-    "S_IFGITLINK",
-    "run_commit_hook",
-    "hook_path",
-)
-
 
 def hook_path(name: str, git_dir: PathLike) -> str:
     """:return: path to the given named hook in the given git repository directory"""

git/index/typ.py

@@ -8,9 +8,10 @@
 from binascii import b2a_hex
 from pathlib import Path
 
-from .util import pack, unpack
 from git.objects import Blob
 
+from .util import pack, unpack
+
 # typing ----------------------------------------------------------------------
 
 from typing import NamedTuple, Sequence, TYPE_CHECKING, Tuple, Union, cast

git/index/util.py

@@ -3,6 +3,8 @@
 
 """Index utilities."""
 
+__all__ = ("TemporaryFileSwap", "post_clear_cache", "default_index", "git_working_dir")
+
 import contextlib
 from functools import wraps
 import os
@@ -22,14 +24,9 @@
 
 # ---------------------------------------------------------------------------------
 
-
-__all__ = ("TemporaryFileSwap", "post_clear_cache", "default_index", "git_working_dir")
-
 # { Aliases
 pack = struct.pack
 unpack = struct.unpack
-
-
 # } END aliases