diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-05-06 18:53:59 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-05-06 18:53:59 +0200 |
| commit | 7ae36c3e019a5cc16924d1b6007774bfb625036f (patch) | |
| tree | 52ad2a3cd8187c42a3a02d6b08dda9493a23042b /git/objects | |
| parent | acf5e6ea64a2f24117f1d419c208ed1c38c43690 (diff) | |
| download | GitPython-7ae36c3e019a5cc16924d1b6007774bfb625036f.tar.gz GitPython-7ae36c3e019a5cc16924d1b6007774bfb625036f.zip | |
Started to fix imports - tests still have no chance to work as database changed drastically. Now the actual work begins
Diffstat (limited to 'git/objects')
| -rw-r--r-- | git/objects/commit.py | 2 | ||||
| -rw-r--r-- | git/objects/submodule/base.py | 3 | ||||
| -rw-r--r-- | git/objects/tree.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/git/objects/commit.py b/git/objects/commit.py index 4ca5877e..45a821a1 100644 --- a/git/objects/commit.py +++ b/git/objects/commit.py @@ -35,7 +35,7 @@ import sys __all__ = ('Commit', ) -class Commit(GitDB_Commit, Diffable, Iterable, RepoAliasMixin, base.Object, Traversable, Serializable): +class Commit(Diffable, Iterable, RepoAliasMixin, base.Object, Traversable, Serializable): """Wraps a git Commit object. This class will act lazily on some of its attributes and will query the diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py index f6cf278a..62f4feee 100644 --- a/git/objects/submodule/base.py +++ b/git/objects/submodule/base.py @@ -1,5 +1,4 @@ from git.util import RepoAliasMixin -from git.object.submodule import Submodule as GitDB_Submodule import util from util import ( mkhead, @@ -55,7 +54,7 @@ UPDWKTREE = UpdateProgress.UPDWKTREE # IndexObject comes via util module, its a 'hacky' fix thanks to pythons import # mechanism which cause plenty of trouble of the only reason for packages and # modules is refactoring - subpackages shoudn't depend on parent packages -class Submodule(GitDB_Submodule, Iterable, Traversable, RepoAliasMixin): +class Submodule(Iterable, Traversable, RepoAliasMixin): """Implements access to a git submodule. They are special in that their sha represents a commit in the submodule's repository which is to be checked out at the path of this instance. diff --git a/git/objects/tree.py b/git/objects/tree.py index 689aeaf6..31f2602d 100644 --- a/git/objects/tree.py +++ b/git/objects/tree.py @@ -8,7 +8,7 @@ import git.diff as diff from git.typ import ObjectType from base import IndexObject from blob import Blob -from submodule import Submodule +from submodule.base import Submodule from fun import ( tree_entries_from_data, |