1 files changed, 14 insertions, 17 deletions
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 40d040b9..3be25e3e 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -1,6 +1,13 @@
-from git.test.lib import (
-    TestBase,
-    with_rw_repo
+from io import BytesIO
+from stat import (
+    S_IFDIR,
+    S_IFREG,
+    S_IFLNK
+)
+
+from git.index import IndexFile
+from git.index.fun import (
+    aggressive_tree_merge
 )
 from git.objects.fun import (
     traverse_tree_recursive,
@@ -8,24 +15,14 @@ from git.objects.fun import (
     tree_to_stream,
     tree_entries_from_data
 )
-
-from git.index.fun import (
-    aggressive_tree_merge
+from git.test.lib import (
+    TestBase,
+    with_rw_repo
 )
-
-from gitdb.util import bin_to_hex
+from git.util import bin_to_hex
 from gitdb.base import IStream
 from gitdb.typ import str_tree_type
 
-from stat import (
-    S_IFDIR,
-    S_IFREG,
-    S_IFLNK
-)
-
-from git.index import IndexFile
-from io import BytesIO
-
 
 class TestFun(TestBase):