From: A. Jesse Jiryu Davis <jesse@mongodb.com>
Date: Wed, 18 Feb 2015 13:57:09 +0000 (-0500)
Subject: Import unittest2 in locks_test if needed.
X-Git-Tag: v4.2.0b1~103^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1341%2Fhead;p=thirdparty%2Ftornado.git

Import unittest2 in locks_test if needed.
---

diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py
index 73f0f5911..d1c9a61d8 100644
--- a/tornado/test/locks_test.py
+++ b/tornado/test/locks_test.py
@@ -11,11 +11,11 @@
 # under the License.
 
 from datetime import timedelta
-import unittest
 
 from tornado import gen, locks
 from tornado.gen import TimeoutError
 from tornado.testing import gen_test, AsyncTestCase
+from tornado.test.util import unittest
 
 
 class ConditionTest(AsyncTestCase):