From 4e7bc75432d366eb32190d8a9e9582be564fbace Mon Sep 17 00:00:00 2001 From: Alex Gaynor 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_multithreading.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/test_multithreading.py') 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 -- cgit v1.2.1