Cross-version mock import

ckanext/harvest/tests/harvesters/test_base.py

@@ -1,7 +1,11 @@
 import re
 
 import pytest
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
 
 from ckanext.harvest.harvesters.base import HarvesterBase, munge_tag
 from ckantoolkit.tests import factories

ckanext/harvest/tests/harvesters/test_ckanharvester.py

@@ -2,7 +2,10 @@ from __future__ import absolute_import
 import copy
 
 import json
-from mock import patch, MagicMock, Mock
+try:
+    from unittest.mock import patch, MagicMock, Mock
+except ImportError:
+    from mock import patch, MagicMock, Mock
 import pytest
 from requests.exceptions import HTTPError, RequestException
 

ckanext/harvest/tests/test_queue.py

@@ -1,5 +1,8 @@
 import pytest
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
 
 from ckanext.harvest.model import HarvestObject, HarvestObjectExtra
 from ckanext.harvest.interfaces import IHarvester