diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
commit | f6aa8d116eb33293c0a9d6d600eb7c32832758b9 (patch) | |
tree | ee07288965cfd4e8326c57735e94c347ee7dd829 /git/objects/submodule | |
parent | 3936084cdd336ce7db7d693950e345eeceab93a5 (diff) | |
download | gitpython-f6aa8d116eb33293c0a9d6d600eb7c32832758b9.tar.gz |
initial set of adjustments to make (most) imports work.
More to come, especially when it's about strings
Diffstat (limited to 'git/objects/submodule')
-rw-r--r-- | git/objects/submodule/base.py | 6 | ||||
-rw-r--r-- | git/objects/submodule/root.py | 7 | ||||
-rw-r--r-- | git/objects/submodule/util.py | 2 |
3 files changed, 9 insertions, 6 deletions
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', |