summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Reifschneider <jafo00@gmail.com>2023-04-15 17:32:27 -0600
committerGitHub <noreply@github.com>2023-04-15 17:32:27 -0600
commit8ded8c327618765eb5501dbb554ffb82e952271d (patch)
tree29363e8848cd8bbfa1c4292d83efded29de14f9f
parentd5fb4199ffc21d559fa3a6f8ea94c4d1eb13ca1a (diff)
parent44c5317773acd0230c2cb9f86e4e6eb6db4e3cb7 (diff)
downloadpython-memcached-8ded8c327618765eb5501dbb554ffb82e952271d.tar.gz
Merge pull request #172 from moto-timo/try-import-unittest-mock
test_memcache.py: try import unittest.mock
-rw-r--r--tests/test_memcache.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_memcache.py b/tests/test_memcache.py
index 40b6524..621ac5c 100644
--- a/tests/test_memcache.py
+++ b/tests/test_memcache.py
@@ -4,7 +4,10 @@ from __future__ import print_function
import unittest
import zlib
-import mock
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
from memcache import Client, _Host, SERVER_MAX_KEY_LENGTH, SERVER_MAX_VALUE_LENGTH # noqa: H301
from .utils import captured_stderr