Remove outdated checks for unittest.mock existence

Harmon758 · Harmon758 · commit 909ee3b9fe30 · 2020-02-16T15:01:49.000-06:00
diff --git 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 @@
     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
@@ -11,6 +11,7 @@
 import re
 import sys
 import time
+from unittest.mock import Mock
 
 from git import (
     Commit,
@@ -33,12 +34,6 @@
 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
@@ -8,6 +8,7 @@
 import subprocess
 import sys
 from tempfile import TemporaryFile
+from unittest import mock
 
 from git import (
     Git,
@@ -32,12 +33,6 @@
 
 import os.path as osp
 
-
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
 from git.compat import is_win
 
 
