diff options
author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-15 13:11:16 +0200 |
---|---|---|
committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-16 02:46:31 +0200 |
commit | 0210e394e0776d0b7097bf666bebd690ed0c0e4f (patch) | |
tree | e74014dd49c93f75b8cf388d700b681a321d261b /git/test/test_commit.py | |
parent | a2d248bb8362808121f6b6abfd316d83b65afa79 (diff) | |
download | gitpython-0210e394e0776d0b7097bf666bebd690ed0c0e4f.tar.gz |
src: import os.path as osp
Diffstat (limited to 'git/test/test_commit.py')
-rw-r--r-- | git/test/test_commit.py | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/git/test/test_commit.py b/git/test/test_commit.py index fd9777fb..fbb1c244 100644 --- a/git/test/test_commit.py +++ b/git/test/test_commit.py @@ -6,34 +6,36 @@ # the BSD License: http://www.opensource.org/licenses/bsd-license.php from __future__ import print_function -from git.test.lib import ( - TestBase, - assert_equal, - assert_not_equal, - with_rw_repo, - fixture_path, - StringProcessAdapter -) +from datetime import datetime +from io import BytesIO +import re +import sys +import time + from git import ( Commit, Actor, ) -from gitdb import IStream -from git.test.lib import with_rw_directory +from git import Repo from git.compat import ( string_types, text_type ) -from git import Repo +from git.objects.util import tzoffset, utc from git.repo.fun import touch +from git.test.lib import ( + TestBase, + assert_equal, + assert_not_equal, + with_rw_repo, + fixture_path, + StringProcessAdapter +) +from git.test.lib import with_rw_directory +from gitdb import IStream + +import os.path as osp -from io import BytesIO -import time -import sys -import re -import os -from datetime import datetime -from git.objects.util import tzoffset, utc try: from unittest.mock import Mock @@ -232,8 +234,8 @@ class TestCommit(TestBase): @with_rw_directory def test_ambiguous_arg_iteration(self, rw_dir): - rw_repo = Repo.init(os.path.join(rw_dir, 'test_ambiguous_arg')) - path = os.path.join(rw_repo.working_tree_dir, 'master') + rw_repo = Repo.init(osp.join(rw_dir, 'test_ambiguous_arg')) + path = osp.join(rw_repo.working_tree_dir, 'master') touch(path) rw_repo.index.add([path]) rw_repo.index.commit('initial commit') |