summaryrefslogtreecommitdiff
path: root/git/test/test_git.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-09-15 00:59:36 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-09-25 18:35:03 +0200
commit7842e92ebaf3fc3380cc8d704afa3841f333748c (patch)
tree0e5b1cdba78bce1c6f26c41945d267a715501d58 /git/test/test_git.py
parentf73468bb9cb9e479a0b81e3766623c32802db579 (diff)
downloadgitpython-7842e92ebaf3fc3380cc8d704afa3841f333748c.tar.gz
test, deps: FIX `mock` deps on py3.
+ Del extra spaces, import os.path as osp
Diffstat (limited to 'git/test/test_git.py')
-rw-r--r--git/test/test_git.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/git/test/test_git.py b/git/test/test_git.py
index b46ac72d..59796a3d 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -6,7 +6,6 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
import sys
-import mock
import subprocess
from git.test.lib import (
@@ -28,6 +27,11 @@ from gitdb.test.lib import with_rw_directory
from git.compat import PY3
+try:
+ from unittest import mock
+except ImportError:
+ import mock
+
class TestGit(TestBase):