initial set of adjustments to make (most) imports work.

More to come, especially when it's about strings

9 files changed, 32 insertions, 32 deletions

diff --git a/git/objects/__init__.py b/git/objects/__init__.py
index 70fc52cb..ee642876 100644
--- a/git/objects/__init__.py
+++ b/git/objects/__init__.py
@@ -7,9 +7,10 @@ import inspect
 from .base import *
 # Fix import dependency - add IndexObject to the util module, so that it can be
 # imported by the submodule.base
-from .submodule import util
-util.IndexObject = IndexObject
-util.Object = Object
+from .submodule import util as smutil
+smutil.IndexObject = IndexObject
+smutil.Object = Object
+del(smutil)
 from .submodule.base import *
 from .submodule.root import *
 
diff --git a/git/objects/base.py b/git/objects/base.py
index 20147e57..1f0d5752 100644
--- a/git/objects/base.py
+++ b/git/objects/base.py
@@ -3,8 +3,8 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
+from .util import get_object_type_by_name
 from git.util import LazyMixin, join_path_native, stream_copy
-from util import get_object_type_by_name
 from gitdb.util import (
     bin_to_hex,
     basename
diff --git a/git/objects/blob.py b/git/objects/blob.py
index b05e5b84..322f6992 100644
--- a/git/objects/blob.py
+++ b/git/objects/blob.py
@@ -3,9 +3,8 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-
 from mimetypes import guess_type
-import base
+from . import base
 
 __all__ = ('Blob', )
 
diff --git a/git/objects/commit.py b/git/objects/commit.py
index 9c733695..5b6b9a33 100644
--- a/git/objects/commit.py
+++ b/git/objects/commit.py
@@ -4,6 +4,8 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
+from gitdb import IStream
+from gitdb.util import hex_to_bin
 from git.util import (
     Actor,
     Iterable,
@@ -11,26 +13,23 @@ from git.util import (
     finalize_process
 )
 from git.diff import Diffable
-from tree import Tree
-from gitdb import IStream
-from cStringIO import StringIO
 
-import base
-from gitdb.util import (
-    hex_to_bin
-)
-from util import (
+from .tree import Tree
+from . import base
+from .util import (
     Traversable,
     Serializable,
     parse_date,
     altz_to_utctz_str,
     parse_actor_and_date
 )
+
 from time import (
     time,
     altzone
 )
 import os
+from io import StringIO
 import logging
 
 log = logging.getLogger('git.objects.commit')
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index d6f8982b..5ccebd4c 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -1,5 +1,5 @@
-import util
-from util import (
+from . import util
+from .util import (
     mkhead,
     sm_name,
     sm_section,
@@ -8,7 +8,7 @@ from util import (
     find_first_remote_branch
 )
 from git.objects.util import Traversable
-from StringIO import StringIO                   # need a dict to set bloody .name field
+from io import StringIO                   # need a dict to set bloody .name field
 from git.util import (
     Iterable,
     join_path_native,
diff --git a/git/objects/submodule/root.py b/git/objects/submodule/root.py
index 708749c7..8c9afff1 100644
--- a/git/objects/submodule/root.py
+++ b/git/objects/submodule/root.py
@@ -1,5 +1,8 @@
-from base import Submodule, UpdateProgress
-from util import (
+from .base import (
+    Submodule,
+    UpdateProgress
+)
+from .util import (
     find_first_remote_branch
 )
 from git.exc import InvalidGitRepositoryError
diff --git a/git/objects/submodule/util.py b/git/objects/submodule/util.py
index 01bd03b3..cb84ccb1 100644
--- a/git/objects/submodule/util.py
+++ b/git/objects/submodule/util.py
@@ -1,7 +1,7 @@
 import git
 from git.exc import InvalidGitRepositoryError
 from git.config import GitConfigParser
-from StringIO import StringIO
+from io import StringIO
 import weakref
 
 __all__ = ('sm_section', 'sm_name', 'mkhead', 'unbare_repo', 'find_first_remote_branch',
diff --git a/git/objects/tag.py b/git/objects/tag.py
index 3c379579..5e76e230 100644
--- a/git/objects/tag.py
+++ b/git/objects/tag.py
@@ -4,12 +4,12 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """ Module containing all object based types. """
-import base
-from gitdb.util import hex_to_bin
-from util import (
+from . import base
+from .util import (
     get_object_type_by_name,
     parse_actor_and_date
 )
+from gitdb.util import hex_to_bin
 
 __all__ = ("TagObject", )
 
diff --git a/git/objects/tree.py b/git/objects/tree.py
index c77e6056..a216322b 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -3,22 +3,20 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-import util
-from base import IndexObject
 from git.util import join_path
-from blob import Blob
-from submodule.base import Submodule
 import git.diff as diff
+from gitdb.util import to_bin_sha
 
-from fun import (
+from . import util
+from .base import IndexObject
+from .blob import Blob
+from .submodule.base import Submodule
+
+from .fun import (
     tree_entries_from_data,
     tree_to_stream
 )
 
-from gitdb.util import (
-    to_bin_sha,
-)
-
 __all__ = ("TreeModifier", "Tree")