diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-31 11:34:49 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-31 11:34:49 -0700 |
| commit | 4e7bc75432d366eb32190d8a9e9582be564fbace (patch) | |
| tree | 7cc9a99662fda3a45c83a2915422ea8db5e69bc3 /tests/test_multithreading.py | |
| parent | 21db1bf83670f284b8f3d1dab4dc2be548ffb57e (diff) | |
| download | python-swiftclient-4e7bc75432d366eb32190d8a9e9582be564fbace.tar.gz | |
Use the standard library's copy of mock when it's available.
Change-Id: Id6a31157582efe47cc3a74e6658679c2bec14767
Diffstat (limited to 'tests/test_multithreading.py')
| -rw-r--r-- | tests/test_multithreading.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py index b566837..81b0766 100644 --- a/tests/test_multithreading.py +++ b/tests/test_multithreading.py @@ -15,7 +15,12 @@ import sys import time -import mock + +try: + from unittest import mock +except ImportError: + import mock + import testtools import threading import six |