diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 14:25:39 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 14:25:39 +0100 |
commit | 1b9d3b961bdf79964b883d3179f085d8835e528d (patch) | |
tree | 7031b7853f92879ee2e106f1e4fbf302c5c20ea6 | |
parent | c80d727e374321573bb00e23876a67c77ff466e3 (diff) | |
download | gitpython-1b9d3b961bdf79964b883d3179f085d8835e528d.tar.gz |
Removed 'from X import *' whereever possible
-rw-r--r-- | git/test/lib/__init__.py | 5 | ||||
-rw-r--r-- | git/test/lib/asserts.py | 20 | ||||
-rw-r--r-- | git/test/performance/lib.py | 4 | ||||
-rw-r--r-- | git/test/performance/test_commit.py | 4 | ||||
-rw-r--r-- | git/test/performance/test_odb.py | 2 | ||||
-rw-r--r-- | git/test/performance/test_streams.py | 15 | ||||
-rw-r--r-- | git/test/performance/test_utils.py | 6 | ||||
-rw-r--r-- | git/test/test_actor.py | 5 | ||||
-rw-r--r-- | git/test/test_base.py | 14 | ||||
-rw-r--r-- | git/test/test_blob.py | 7 | ||||
-rw-r--r-- | git/test/test_commit.py | 14 | ||||
-rw-r--r-- | git/test/test_config.py | 9 | ||||
-rw-r--r-- | git/test/test_db.py | 4 | ||||
-rw-r--r-- | git/test/test_diff.py | 16 | ||||
-rw-r--r-- | git/test/test_fun.py | 7 | ||||
-rw-r--r-- | git/test/test_index.py | 19 | ||||
-rw-r--r-- | git/test/test_reflog.py | 10 | ||||
-rw-r--r-- | git/test/test_refs.py | 17 | ||||
-rw-r--r-- | git/test/test_remote.py | 20 | ||||
-rw-r--r-- | git/test/test_repo.py | 33 | ||||
-rw-r--r-- | git/test/test_stats.py | 10 | ||||
-rw-r--r-- | git/test/test_submodule.py | 7 | ||||
-rw-r--r-- | git/test/test_tree.py | 7 | ||||
-rw-r--r-- | git/test/test_util.py | 21 |
24 files changed, 209 insertions, 67 deletions
diff --git a/git/test/lib/__init__.py b/git/test/lib/__init__.py index 26ea13a3..033a1104 100644 --- a/git/test/lib/__init__.py +++ b/git/test/lib/__init__.py @@ -5,9 +5,8 @@ # the BSD License: http://www.opensource.org/licenses/bsd-license.php import inspect -from mock import * -from asserts import * -from helper import * +from .asserts import * +from .helper import * __all__ = [name for name, obj in locals().items() if not (name.startswith('_') or inspect.ismodule(obj))] diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py index 6f6d8960..98751d4d 100644 --- a/git/test/lib/asserts.py +++ b/git/test/lib/asserts.py @@ -5,15 +5,27 @@ # the BSD License: http://www.opensource.org/licenses/bsd-license.php import re -from nose import tools -from nose.tools import * import stat __all__ = ['assert_instance_of', 'assert_not_instance_of', 'assert_none', 'assert_not_none', 'assert_match', 'assert_not_match', 'assert_mode_644', - 'assert_mode_755'] + tools.__all__ - + 'assert_mode_755', + 'assert_equal', 'assert_not_equal', 'assert_raises', 'patch', 'raises', + 'assert_true', 'assert_false'] + +from nose.tools import ( + assert_equal, + assert_not_equal, + assert_raises, + raises, + assert_true, + assert_false +) + +from mock import ( + patch +) def assert_instance_of(expected, actual, msg=None): """Verify that object is an instance of expected """ diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index 928821ed..5c138f17 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -1,6 +1,8 @@ """Contains library functions""" import os -from git.test.lib import * +from git.test.lib import ( + TestBase +) from gitdb.test.lib import skip_on_travis_ci import shutil import tempfile diff --git a/git/test/performance/test_commit.py b/git/test/performance/test_commit.py index c256a75c..257442ea 100644 --- a/git/test/performance/test_commit.py +++ b/git/test/performance/test_commit.py @@ -4,8 +4,8 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -from lib import * -from git import * +from .lib import TestBigRepoRW +from git import Commit from gitdb import IStream from git.test.test_commit import assert_commit_serialization from cStringIO import StringIO diff --git a/git/test/performance/test_odb.py b/git/test/performance/test_odb.py index 1b570fa7..779adb00 100644 --- a/git/test/performance/test_odb.py +++ b/git/test/performance/test_odb.py @@ -3,7 +3,7 @@ from time import time import sys -from lib import ( +from .lib import ( TestBigRepoR ) diff --git a/git/test/performance/test_streams.py b/git/test/performance/test_streams.py index 18f19db3..48527f0e 100644 --- a/git/test/performance/test_streams.py +++ b/git/test/performance/test_streams.py @@ -1,20 +1,23 @@ """Performance data streaming performance""" - -from git.test.lib import * -from gitdb import * -from gitdb.util import bin_to_hex - from time import time import os import sys import subprocess +from git.test.lib import ( + with_rw_repo +) +from gitdb.util import bin_to_hex from gitdb.test.lib import make_memory_file -from lib import ( +from .lib import ( TestBigRepoR ) +from gitdb import ( + LooseObjectDB, + IStream +) class TestObjDBPerformance(TestBigRepoR): diff --git a/git/test/performance/test_utils.py b/git/test/performance/test_utils.py index e7c33aa2..0bd47098 100644 --- a/git/test/performance/test_utils.py +++ b/git/test/performance/test_utils.py @@ -2,7 +2,7 @@ from time import time import sys -from lib import ( +from .lib import ( TestBigRepoR ) @@ -93,14 +93,14 @@ class TestUtilPerformance(TestBigRepoR): # tuple and tuple direct st = time() for i in xrange(ni): - t = (1, 2, 3, 4) + (1, 2, 3, 4) # END for each item elapsed = time() - st print >> sys.stderr, "Created %i tuples (1,2,3,4) in %f s ( %f tuples / s)" % (ni, elapsed, ni / elapsed) st = time() for i in xrange(ni): - t = tuple((1, 2, 3, 4)) + tuple((1, 2, 3, 4)) # END for each item elapsed = time() - st print >> sys.stderr, "Created %i tuples tuple((1,2,3,4)) in %f s ( %f tuples / s)" % (ni, elapsed, ni / elapsed) diff --git a/git/test/test_actor.py b/git/test/test_actor.py index ee968455..d79673f8 100644 --- a/git/test/test_actor.py +++ b/git/test/test_actor.py @@ -4,9 +4,8 @@ # 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 import * - +from git.test.lib import assert_equal +from git import Actor class TestActor(object): diff --git a/git/test/test_base.py b/git/test/test_base.py index ea241f4c..a14d4680 100644 --- a/git/test/test_base.py +++ b/git/test/test_base.py @@ -7,8 +7,18 @@ import git.objects.base as base import os -from git.test.lib import * -from git import * +from git.test.lib import ( + TestBase, + assert_raises, + with_rw_repo, + with_rw_and_rw_remote_repo +) +from git import ( + Blob, + Tree, + Commit, + TagObject +) from git.objects.util import get_object_type_by_name from gitdb.util import hex_to_bin diff --git a/git/test/test_blob.py b/git/test/test_blob.py index cf45d82a..b529e80f 100644 --- a/git/test/test_blob.py +++ b/git/test/test_blob.py @@ -4,8 +4,11 @@ # 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 import * +from git.test.lib import ( + TestBase, + assert_equal +) +from git import Blob class TestBlob(TestBase): diff --git a/git/test/test_commit.py b/git/test/test_commit.py index 22a302c6..961ae44f 100644 --- a/git/test/test_commit.py +++ b/git/test/test_commit.py @@ -5,8 +5,18 @@ # 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 import * +from git.test.lib import ( + TestBase, + assert_equal, + assert_not_equal, + with_rw_repo, + fixture_path, + StringProcessAdapter +) +from git import ( + Commit, + Actor, +) from gitdb import IStream from gitdb.util import hex_to_bin diff --git a/git/test/test_config.py b/git/test/test_config.py index 3e435c47..f470b143 100644 --- a/git/test/test_config.py +++ b/git/test/test_config.py @@ -4,8 +4,13 @@ # 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 import * +from git.test.lib import ( + TestCase, + fixture_path +) +from git import ( + GitConfigParser +) import StringIO from copy import copy from ConfigParser import NoSectionError diff --git a/git/test/test_db.py b/git/test/test_db.py index b53c4209..5dcf592a 100644 --- a/git/test/test_db.py +++ b/git/test/test_db.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 git.test.lib import * -from git.db import * +from git.test.lib import TestBase +from git.db import GitCmdObjectDB from gitdb.util import bin_to_hex from git.exc import BadObject import os diff --git a/git/test/test_diff.py b/git/test/test_diff.py index 8e2cef4b..adac5ed4 100644 --- a/git/test/test_diff.py +++ b/git/test/test_diff.py @@ -4,9 +4,19 @@ # 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 import * - +from git.test.lib import ( + TestBase, + StringProcessAdapter, + fixture, + assert_equal, + assert_true, + +) + +from git import ( + Diff, + DiffIndex +) class TestDiff(TestBase): diff --git a/git/test/test_fun.py b/git/test/test_fun.py index 5fa0c77b..bf178aaa 100644 --- a/git/test/test_fun.py +++ b/git/test/test_fun.py @@ -1,4 +1,7 @@ -from git.test.lib import * +from git.test.lib import ( + TestBase, + with_rw_repo +) from git.objects.fun import ( traverse_tree_recursive, traverse_trees_recursive, @@ -78,7 +81,7 @@ class TestFun(TestBase): @with_rw_repo('0.1.6') def test_three_way_merge(self, rwrepo): def mkfile(name, sha, executable=0): - return (sha, S_IFREG | 0644 | executable * 0111, name) + return (sha, S_IFREG | 0o644 | executable * 0o111, name) def mkcommit(name, sha): return (sha, S_IFDIR | S_IFLNK, name) diff --git a/git/test/test_index.py b/git/test/test_index.py index 08dfdd12..2eef4b5d 100644 --- a/git/test/test_index.py +++ b/git/test/test_index.py @@ -4,8 +4,23 @@ # 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 import * +from git.test.lib import ( + TestBase, + fixture_path, + fixture, + with_rw_repo +) +from git import ( + IndexFile, + BlobFilter, + UnmergedEntriesError, + Tree, + Object, + Diff, + GitCommandError, + CheckoutError, + +) from gitdb.util import hex_to_bin import os import sys diff --git a/git/test/test_reflog.py b/git/test/test_reflog.py index c281aa44..4efb8025 100644 --- a/git/test/test_reflog.py +++ b/git/test/test_reflog.py @@ -1,6 +1,12 @@ -from git.test.lib import * +from git.test.lib import ( + TestBase, + fixture_path +) from git.objects import IndexObject -from git.refs import * +from git.refs import ( + RefLogEntry, + RefLog +) from git.util import Actor import tempfile diff --git a/git/test/test_refs.py b/git/test/test_refs.py index 4df3fa8a..af33765a 100644 --- a/git/test/test_refs.py +++ b/git/test/test_refs.py @@ -4,9 +4,20 @@ # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -from mock import * -from git.test.lib import * -from git import * +from git.test.lib import ( + TestBase, + with_rw_repo +) +from git import ( + Reference, + Head, + TagReference, + RemoteReference, + Commit, + SymbolicReference, + GitCommandError, + RefLog +) import git.refs as refs from git.util import Actor from git.objects.tag import TagObject diff --git a/git/test/test_remote.py b/git/test/test_remote.py index d49a9061..a8d5179a 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -4,8 +4,24 @@ # 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 import * +from git.test.lib import ( + TestBase, + with_rw_repo, + with_rw_and_rw_remote_repo +) +from git import ( + RemoteProgress, + FetchInfo, + Reference, + SymbolicReference, + Head, + Commit, + PushInfo, + RemoteReference, + TagReference, + Remote, + GitCommandError +) from git.util import IterableList import tempfile import shutil diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 3f1a3a3c..f6b46a6e 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -3,15 +3,30 @@ # # 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 (patch, - TestBase, - with_rw_repo, - fixture, - assert_false, - assert_equal, - assert_true, - raises) -from git import * +from git.test.lib import ( + patch, + TestBase, + with_rw_repo, + fixture, + assert_false, + assert_equal, + assert_true, + raises +) +from git import ( + InvalidGitRepositoryError, + Repo, + NoSuchPathError, + Head, + Commit, + Tree, + IndexFile, + Git, + Reference, + GitDB, + Submodule, + GitCmdObjectDB +) from git.util import join_path_native from git.exc import BadObject from gitdb.util import bin_to_hex diff --git a/git/test/test_stats.py b/git/test/test_stats.py index d827c680..c4535b75 100644 --- a/git/test/test_stats.py +++ b/git/test/test_stats.py @@ -4,13 +4,17 @@ # 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 import * +from git.test.lib import ( + TestBase, + fixture, + assert_equal +) +from git import Stats class TestStats(TestBase): - def test__list_from_string(self): + def test_list_from_string(self): output = fixture('diff_numstat') stats = Stats._list_from_string(self.rorepo, output) diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py index e3223c42..ec3459e4 100644 --- a/git/test/test_submodule.py +++ b/git/test/test_submodule.py @@ -1,8 +1,11 @@ # 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.exc import * +from git.test.lib import ( + TestBase, + with_rw_repo +) +from git.exc import InvalidGitRepositoryError from git.objects.submodule.base import Submodule from git.objects.submodule.root import RootModule, RootUpdateProgress from git.util import to_native_path_linux, join_path_native diff --git a/git/test/test_tree.py b/git/test/test_tree.py index adcb854f..d2e3606b 100644 --- a/git/test/test_tree.py +++ b/git/test/test_tree.py @@ -5,8 +5,11 @@ # the BSD License: http://www.opensource.org/licenses/bsd-license.php import os -from git.test.lib import * -from git import * +from git.test.lib import TestBase +from git import ( + Tree, + Blob +) from cStringIO import StringIO diff --git a/git/test/test_util.py b/git/test/test_util.py index 28aefa61..888eb4ee 100644 --- a/git/test/test_util.py +++ b/git/test/test_util.py @@ -6,10 +6,23 @@ import tempfile -from git.util import * -from git.test.lib import * -from git.objects.util import * -from git import * +from git.test.lib import ( + TestBase, + assert_equal +) +from git.util import ( + LockFile, + BlockingLockFile, + get_user_id, + Actor, + IterableList +) +from git.objects.util import ( + altz_to_utctz_str, + utctz_to_altz, + verify_utctz, + parse_date, +) from git.cmd import dashify import time |