diff options
| author | Sean Reifschneider <jafo00@gmail.com> | 2023-04-15 18:10:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 18:10:38 -0600 |
| commit | f6672ee3139ed64f6a97e50e87f4431356cf4a91 (patch) | |
| tree | a7bfab48f6d82ae83cbc6aafae8aa4564ad88440 /tests | |
| parent | c58d18a925621f99e21905be9e49a5b55b7bcf30 (diff) | |
| parent | 511604b5e829962b1dc40132cd84ea629e141c32 (diff) | |
| download | python-memcached-f6672ee3139ed64f6a97e50e87f4431356cf4a91.tar.gz | |
Merge branch 'master' into support_default
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_memcache.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_memcache.py b/tests/test_memcache.py index 4cdf7a6..d0f4857 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 |