Started to fix imports - tests still have no chance to work as database changed drastically. Now the actual work begins

21 files changed, 45 insertions, 37 deletions

diff --git a/git/test/lib/__init__.py b/git/test/lib/__init__.py
index b09a86b1..a0656438 100644
--- a/git/test/lib/__init__.py
+++ b/git/test/lib/__init__.py
@@ -5,10 +5,14 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import inspect
+# TODO: Separate names - they do repeat unfortunately. Also deduplicate it, 
+# redesign decorators to support multiple database types in succession.
+from base import *
+
 from mock import *
 from asserts import *
 from helper import *
-from base import *
+
 
 __all__ = [ name for name, obj in locals().items()
             if not (name.startswith('_') or inspect.ismodule(obj)) ]
diff --git a/git/test/lib/base.py b/git/test/lib/base.py
index 9ed2c4b2..3725d544 100644
--- a/git/test/lib/base.py
+++ b/git/test/lib/base.py
@@ -3,14 +3,17 @@
 # This module is part of PureGitDB and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Utilities used in ODB testing"""
-from git import OStream
+from git.base import OStream
 from git.db.py import PureGitDB
 from git.stream import ( 
 							Sha1Writer, 
 							ZippedStoreShaWriter
 						)
 
-from git.util import zlib
+from git.util import (
+						zlib,
+						dirname
+					)
 
 import sys
 import random
@@ -31,7 +34,7 @@ def with_rw_directory(func):
 	"""Create a temporary directory which can be written to, remove it if the 
 	test suceeds, but leave it otherwise to aid additional debugging"""
 	def wrapper(self):
-		path = tempfile.mktemp(prefix=func.__name__)
+		path = maketemp(prefix=func.__name__)
 		os.mkdir(path)
 		keep = False
 		try:
@@ -64,7 +67,7 @@ def with_rw_repo(func):
 	that should exist
 	Wrapped function obtains a git repository """
 	def wrapper(self, path):
-		src_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+		src_dir = dirname(dirname(dirname(__file__)))
 		assert(os.path.isdir(path))
 		os.rmdir(path)		# created by wrapper, but must not exist for copy operation
 		shutil.copytree(src_dir, path)
@@ -98,7 +101,7 @@ def with_packs_rw(func):
 def repo_dir():
 	""":return: path to our own repository, being our own .git directory.
 	:note: doesn't work in bare repositories"""
-	base = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), '.git')
+	base = os.path.join(dirname(dirname(dirname(dirname(__file__)))), '.git')
 	assert os.path.isdir(base)
 	return base
 	
@@ -114,7 +117,7 @@ def fixture_path(relapath=''):
 	""":return: absolute path into the fixture directory
 	:param relapath: relative path into the fixtures directory, or ''
 		to obtain the fixture directory itself"""
-	return os.path.join(os.path.dirname(__file__), 'fixtures', relapath)
+	return os.path.join(dirname(__file__), 'fixtures', relapath)
 	
 def copy_files_globbed(source_glob, target_dir, hard_link_ok=False):
 	"""Copy all files found according to the given source glob into the target directory
diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
index edf833d7..48d684e0 100644
--- a/git/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -12,7 +12,7 @@ import tempfile
 import shutil
 import cStringIO
 
-from git.test.lib import maketemp 
+from base import maketemp 
 
 GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
 
diff --git a/git/test/objects/test_blob.py b/git/test/objects/test_blob.py
index 7041010f..a6de7fb7 100644
--- a/git/test/objects/test_blob.py
+++ b/git/test/objects/test_blob.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git.util import hex_to_bin
 
diff --git a/git/test/objects/test_commit.py b/git/test/objects/test_commit.py
index b2cc5b27..3ccff228 100644
--- a/git/test/objects/test_commit.py
+++ b/git/test/objects/test_commit.py
@@ -5,7 +5,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git import IStream
 from git.util import hex_to_bin
diff --git a/git/test/objects/test_submodule.py b/git/test/objects/test_submodule.py
index d6062be9..cb5fd33f 100644
--- a/git/test/objects/test_submodule.py
+++ b/git/test/objects/test_submodule.py
@@ -1,7 +1,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git.exc import *
 from git.objects.submodule.base import Submodule
 from git.objects.submodule.root import RootModule, RootUpdateProgress
diff --git a/git/test/objects/test_tree.py b/git/test/objects/test_tree.py
index ec10e962..af32aeb9 100644
--- a/git/test/objects/test_tree.py
+++ b/git/test/objects/test_tree.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import os
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git.objects.fun import (
 								traverse_tree_recursive,
diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py
index d0727b60..08c0e91c 100644
--- a/git/test/performance/lib.py
+++ b/git/test/performance/lib.py
@@ -1,11 +1,11 @@
 """Contains library functions"""
 import os
-from git.test.lib import *
+from git.test.lib import TestBase
 import shutil
 import tempfile
 
 from git.db import (
-						GitCmdObjectDB,
+						CmdGitDB,
 						GitDB
 					)
 
@@ -54,7 +54,7 @@ class TestBigRepoR(TestBase):
 	def setUpAll(cls):
 		super(TestBigRepoR, cls).setUpAll()
 		repo_path = resolve_or_fail(k_env_git_repo)
-		cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB)
+		cls.gitrorepo = Repo(repo_path, odbt=CmdGitDB)
 		cls.puregitrorepo = Repo(repo_path, odbt=GitDB)
 
 
@@ -68,7 +68,7 @@ class TestBigRepoRW(TestBigRepoR):
 		super(TestBigRepoRW, cls).setUpAll()
 		dirname = tempfile.mktemp()
 		os.mkdir(dirname)
-		cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB)
+		cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=CmdGitDB)
 		cls.puregitrwrepo = Repo(dirname, odbt=GitDB)
 	
 	@classmethod
diff --git a/git/test/performance/test_streams.py b/git/test/performance/test_streams.py
index f63d922d..25c211b0 100644
--- a/git/test/performance/test_streams.py
+++ b/git/test/performance/test_streams.py
@@ -7,7 +7,7 @@ from git.util import (
 							bin_to_hex
 						)
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git.util import bin_to_hex
 
diff --git a/git/test/test_base.py b/git/test/test_base.py
index 29916066..ca812ed4 100644
--- a/git/test/test_base.py
+++ b/git/test/test_base.py
@@ -3,12 +3,18 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
+from lib import (
+				TestBase,
+				with_rw_repo,
+				DummyStream,
+				DeriveTest,
+				with_rw_and_rw_remote_repo
+				)
 
 import git.objects.base as base
 import git.refs as refs
 import os
 
-from git.test.lib import *
 from git import *
 from itertools import chain
 from git.objects.util import get_object_type_by_name
@@ -16,11 +22,6 @@ from git.util import hex_to_bin
 import tempfile
 
 ##################
-from lib import (
-		TestBase,
-		DummyStream,
-		DeriveTest, 
-	)
 
 from git import *
 from git.util import (
diff --git a/git/test/test_config.py b/git/test/test_config.py
index 173e380c..b163b0af 100644
--- a/git/test/test_config.py
+++ b/git/test/test_config.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 import StringIO
 from copy import copy
diff --git a/git/test/test_db.py b/git/test/test_db.py
index 5b60644a..825aadd9 100644
--- a/git/test/test_db.py
+++ b/git/test/test_db.py
@@ -3,7 +3,7 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from git.test.lib import *
+from git.test.lib import TestBase
 from git.db import *
 from git.util import bin_to_hex
 from git.exc import BadObject
@@ -12,7 +12,7 @@ import os
 class TestDB(TestBase):
 	
 	def test_base(self):
-		gdb = GitCmdObjectDB(os.path.join(self.rorepo.git_dir, 'objects'), self.rorepo.git)
+		gdb = CmdGitDB(os.path.join(self.rorepo.git_dir, 'objects'), self.rorepo.git)
 		
 		# partial to complete - works with everything
 		hexsha = bin_to_hex(gdb.partial_to_complete_sha_hex("0.1.6"))
diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index 83db2df6..0f006aa3 100644
--- a/git/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 
 class TestDiff(TestBase):
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 99569d00..443f106c 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -1,4 +1,4 @@
-from git.test.lib import *
+from git.test.lib import TestBase
 from git.objects.fun import (
 								traverse_tree_recursive,
 								traverse_trees_recursive, 
diff --git a/git/test/test_git.py b/git/test/test_git.py
index c92a642b..7d8ff371 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import os, sys
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import Git, GitCommandError
 
 class TestGit(TestCase):
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 5d227897..3b94c4a6 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 import inspect
 import os
diff --git a/git/test/test_reflog.py b/git/test/test_reflog.py
index 3fdf1fae..0207f4e4 100644
--- a/git/test/test_reflog.py
+++ b/git/test/test_reflog.py
@@ -1,4 +1,4 @@
-from git.test.lib import *
+from git.test.lib import TestBase
 from git.objects import IndexObject
 from git.refs import *
 from git.util import Actor
diff --git a/git/test/test_refs.py b/git/test/test_refs.py
index 722c5ed5..2e018e7f 100644
--- a/git/test/test_refs.py
+++ b/git/test/test_refs.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
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git.ref import *
 import git.ref as ref
 
 from git.util import Actor
-from git.object.tag import TagObject
+from git.objects.tag import TagObject
 
 from itertools import chain
 import os
diff --git a/git/test/test_remote.py b/git/test/test_remote.py
index af6915a3..301d1833 100644
--- a/git/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git.util import IterableList
 import tempfile
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 9225040f..8677d10d 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -3,7 +3,7 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 from git.util import join_path_native
 from git.exc import BadObject
@@ -582,7 +582,7 @@ class TestRepo(TestBase):
 	def test_repo_odbtype(self):
 		target_type = GitDB
 		if sys.version_info[1] < 5:
-			target_type = GitCmdObjectDB
+			target_type = CmdGitDB
 		assert isinstance(self.rorepo.odb, target_type)
 			
 	def test_submodules(self):
diff --git a/git/test/test_stats.py b/git/test/test_stats.py
index 2bdb0a89..b91ee1f6 100644
--- a/git/test/test_stats.py
+++ b/git/test/test_stats.py
@@ -4,7 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
-from git.test.lib import *
+from git.test.lib import TestBase
 from git import *
 
 class TestStats(TestBase):