From 4e7bc75432d366eb32190d8a9e9582be564fbace Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 31 Mar 2014 11:34:49 -0700
Subject: Use the standard library's copy of mock when it's available.

Change-Id: Id6a31157582efe47cc3a74e6658679c2bec14767
---
 tests/test_command_helpers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests/test_command_helpers.py')

diff --git a/tests/test_command_helpers.py b/tests/test_command_helpers.py
index 140e915..af81601 100644
--- a/tests/test_command_helpers.py
+++ b/tests/test_command_helpers.py
@@ -13,8 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 from six import StringIO
-import mock
 import testtools
 
 from swiftclient import command_helpers as h
-- 
cgit v1.2.1