summaryrefslogtreecommitdiff
path: root/tests/test_swiftclient.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_swiftclient.py')
-rw-r--r--tests/test_swiftclient.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_swiftclient.py b/tests/test_swiftclient.py
index d5e1e09..80f074c 100644
--- a/tests/test_swiftclient.py
+++ b/tests/test_swiftclient.py
@@ -14,8 +14,13 @@
# limitations under the License.
# TODO: More tests
-import mock
import logging
+
+try:
+ from unittest import mock
+except ImportError:
+ import mock
+
import six
import socket
import testtools