test: Remove legacy unittest2 compatibility cruft

Author: bdarnell

tornado/test/asyncio_test.py

@@ -13,13 +13,13 @@
 from __future__ import absolute_import, division, print_function
 
 import asyncio
+import unittest
 
 from concurrent.futures import ThreadPoolExecutor
 from tornado import gen
 from tornado.ioloop import IOLoop
 from tornado.platform.asyncio import AsyncIOLoop, to_asyncio_future, AnyThreadEventLoopPolicy
 from tornado.testing import AsyncTestCase, gen_test
-from tornado.test.util import unittest
 
 
 class AsyncIOLoopTest(AsyncTestCase):

tornado/test/autoreload_test.py

@@ -6,8 +6,7 @@
 import sys
 from tempfile import mkdtemp
 import time
-
-from tornado.test.util import unittest
+import unittest
 
 
 class AutoreloadTest(unittest.TestCase):

tornado/test/concurrent_test.py

@@ -18,14 +18,14 @@
 import logging
 import re
 import socket
+import unittest
 
 from tornado.concurrent import Future, run_on_executor, future_set_result_unless_cancelled
 from tornado.escape import utf8, to_unicode
 from tornado import gen
 from tornado.iostream import IOStream
 from tornado.tcpserver import TCPServer
 from tornado.testing import AsyncTestCase, bind_unused_port, gen_test
-from tornado.test.util import unittest
 
 
 class MiscFutureTest(AsyncTestCase):

tornado/test/curl_httpclient_test.py

@@ -2,11 +2,11 @@
 from __future__ import absolute_import, division, print_function
 
 from hashlib import md5
+import unittest
 
 from tornado.escape import utf8
 from tornado.testing import AsyncHTTPTestCase
 from tornado.test import httpclient_test
-from tornado.test.util import unittest
 from tornado.web import Application, RequestHandler
 
 

tornado/test/escape_test.py

@@ -1,12 +1,13 @@
 from __future__ import absolute_import, division, print_function
 
+import unittest
+
 import tornado.escape
 from tornado.escape import (
     utf8, xhtml_escape, xhtml_unescape, url_escape, url_unescape,
     to_unicode, json_decode, json_encode, squeeze, recursive_unicode,
 )
 from tornado.util import unicode_type
-from tornado.test.util import unittest
 
 linkify_tests = [
     # (input, linkify_kwargs, expected_output)

tornado/test/gen_test.py

@@ -8,11 +8,12 @@
 import sys
 import time
 import weakref
+import unittest
 
 from tornado.concurrent import Future
 from tornado.log import app_log
 from tornado.testing import AsyncHTTPTestCase, AsyncTestCase, ExpectLog, gen_test
-from tornado.test.util import unittest, skipOnTravis, skipNotCPython
+from tornado.test.util import skipOnTravis, skipNotCPython
 from tornado.web import Application, RequestHandler, HTTPError
 
 from tornado import gen

tornado/test/httpclient_test.py

@@ -10,6 +10,7 @@
 from io import BytesIO
 import time
 import unicodedata
+import unittest
 
 from tornado.escape import utf8, native_str
 from tornado import gen
@@ -20,7 +21,7 @@
 from tornado.log import gen_log
 from tornado import netutil
 from tornado.testing import AsyncHTTPTestCase, bind_unused_port, gen_test, ExpectLog
-from tornado.test.util import unittest, skipOnTravis
+from tornado.test.util import skipOnTravis
 from tornado.web import Application, RequestHandler, url
 from tornado.httputil import format_timestamp, HTTPHeaders
 

tornado/test/httpserver_test.py

@@ -13,7 +13,7 @@
 from tornado.netutil import ssl_options_to_context
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, ExpectLog, gen_test  # noqa: E501
-from tornado.test.util import unittest, skipOnTravis
+from tornado.test.util import skipOnTravis
 from tornado.web import Application, RequestHandler, stream_request_body
 
 from contextlib import closing
@@ -25,6 +25,7 @@
 import ssl
 import sys
 import tempfile
+import unittest
 from io import BytesIO
 
 

tornado/test/httputil_test.py

@@ -9,14 +9,14 @@
 from tornado.escape import utf8, native_str
 from tornado.log import gen_log
 from tornado.testing import ExpectLog
-from tornado.test.util import unittest
 
 import copy
 import datetime
 import logging
 import pickle
 import time
 import urllib.parse
+import unittest
 
 
 class TestUrlConcat(unittest.TestCase):

tornado/test/import_test.py

@@ -3,8 +3,7 @@
 
 import subprocess
 import sys
-
-from tornado.test.util import unittest
+import unittest
 
 _import_everything = b"""
 # The event loop is not fork-safe, and it's easy to initialize an asyncio.Future