Moved test stuff around and modified imports to just clean things up a bit.

Author: empty

lib/git_python/__init__.py

@@ -1,17 +1,17 @@
 import inspect
 
-from actor import Actor
-from blob import Blob
-from commit import Commit
-from diff import Diff
-from errors import InvalidGitRepositoryError, NoSuchPathError
-from git import Git
-from head import Head
-from repo import Repo
-from stats import Stats
-from tag import Tag
-from tree import Tree
-from utils import shell_escape, dashify, touch
+from git_python.actor import Actor
+from git_python.blob import Blob
+from git_python.commit import Commit
+from git_python.diff import Diff
+from git_python.errors import InvalidGitRepositoryError, NoSuchPathError
+from git_python.git import Git
+from git_python.head import Head
+from git_python.repo import Repo
+from git_python.stats import Stats
+from git_python.tag import Tag
+from git_python.tree import Tree
+from git_python.utils import shell_escape, dashify, touch
 
 __all__ = [ name for name, obj in locals().items()
             if not (name.startswith('_') or inspect.ismodule(obj)) ]

test/git/test_actor.py

@@ -1,7 +1,6 @@
 import os
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestActor(object):
     def test_from_string_should_separate_name_and_email(self):

test/git/test_blob.py

@@ -1,8 +1,6 @@
 import time
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestBlob(object):
     def setup(self):

test/git/test_commit.py

@@ -1,7 +1,5 @@
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestCommit(object):
     def setup(self):

test/git/test_diff.py

@@ -1,6 +1,5 @@
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestDiff(object):
     def setup(self):

test/git/test_git.py

@@ -1,8 +1,6 @@
 import os
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestGit(object):
     def setup(self):

test/git/test_head.py

@@ -1,7 +1,5 @@
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestHead(object):
     def setup(self):

test/git/test_repo.py

@@ -1,9 +1,7 @@
 import os
 import time
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestRepo(object):
     def setup(self):

test/git/test_stats.py

@@ -1,6 +1,5 @@
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestStats(object):
     def setup(self):

test/git/test_tag.py

@@ -1,7 +1,7 @@
 from mock import *
-from test.asserts import *
-from git_python import *
+from test.testlib import *
 from test.helper import *
+from git_python import *
 
 class TestTag(object):
     def setup(self):