summaryrefslogtreecommitdiff
path: root/git/test/test_git.py
diff options
context:
space:
mode:
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):