summaryrefslogtreecommitdiff
path: root/git/test
diff options
context:
space:
mode:
authorHarmon <Harmon758@gmail.com>2020-02-16 15:01:49 -0600
committerHarmon <Harmon758@gmail.com>2020-02-16 15:01:49 -0600
commit909ee3b9fe308f99c98ad3cc56f0c608e71fdee7 (patch)
tree3253b1a4663b7799069c7d671c4c717b76b9b70a /git/test
parent7d94159db3067cc5def101681e6614502837cea5 (diff)
downloadgitpython-909ee3b9fe308f99c98ad3cc56f0c608e71fdee7.tar.gz
Remove outdated checks for unittest.mock existence
Diffstat (limited to 'git/test')
-rw-r--r--git/test/lib/asserts.py6
-rw-r--r--git/test/test_commit.py7
-rw-r--r--git/test/test_git.py7
3 files changed, 3 insertions, 17 deletions
diff --git a/git/test/lib/asserts.py b/git/test/lib/asserts.py
index 6f5ba714..92f95418 100644
--- a/git/test/lib/asserts.py
+++ b/git/test/lib/asserts.py
@@ -6,6 +6,7 @@
import re
import stat
+from unittest.mock import patch
from nose.tools import (
assert_equal, # @UnusedImport
@@ -16,11 +17,6 @@ from nose.tools import (
assert_false # @UnusedImport
)
-try:
- from unittest.mock import patch
-except ImportError:
- from mock import patch # @NoMove @UnusedImport
-
__all__ = ['assert_instance_of', 'assert_not_instance_of',
'assert_none', 'assert_not_none',
'assert_match', 'assert_not_match', 'assert_mode_644',
diff --git a/git/test/test_commit.py b/git/test/test_commit.py
index 28f03c1c..500af4ef 100644
--- a/git/test/test_commit.py
+++ b/git/test/test_commit.py
@@ -11,6 +11,7 @@ from io import BytesIO
import re
import sys
import time
+from unittest.mock import Mock
from git import (
Commit,
@@ -33,12 +34,6 @@ from gitdb import IStream
import os.path as osp
-try:
- from unittest.mock import Mock
-except ImportError:
- from mock import Mock
-
-
def assert_commit_serialization(rwrepo, commit_id, print_performance_info=False):
"""traverse all commits in the history of commit identified by commit_id and check
if the serialization works.
diff --git a/git/test/test_git.py b/git/test/test_git.py
index a3ba548d..965d7f39 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -8,6 +8,7 @@ import os
import subprocess
import sys
from tempfile import TemporaryFile
+from unittest import mock
from git import (
Git,
@@ -32,12 +33,6 @@ from git.util import finalize_process
import os.path as osp
-
-try:
- from unittest import mock
-except ImportError:
- import mock
-
from git.compat import is_win