From f52541129c09d3ce6847e94643eda9e9c9712c93 Mon Sep 17 00:00:00 2001 From: "A. Jesse Jiryu Davis" Date: Wed, 18 Feb 2015 08:57:09 -0500 Subject: [PATCH] Import unittest2 in locks_test if needed. --- tornado/test/locks_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py index 73f0f5911f..d1c9a61d8c 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):