test: Remove legacy unittest2 compatibility cruft

diff --git a/tornado/test/asyncio_test.py b/tornado/test/asyncio_test.py
index 59b0c5233da6cb874a8da465244f9cf1c33728c9..23073090d87a5cbb24b070a34ba59c6478569dd2 100644 (file)
--- a/tornado/test/asyncio_test.py
+++ b/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):

diff --git a/tornado/test/autoreload_test.py b/tornado/test/autoreload_test.py
index 5cbdc2ee13903e9081a67fa05ac50b93edaeb557..bac17fa66d857d8e81e6be86923dd628101aa067 100644 (file)
--- a/tornado/test/autoreload_test.py
+++ b/tornado/test/autoreload_test.py
@@ -6,8 +6,7 @@ from subprocess import Popen
 import sys
 from tempfile import mkdtemp
 import time
-
-from tornado.test.util import unittest
+import unittest
 
 
 class AutoreloadTest(unittest.TestCase):

diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py
index 885ae58078295c785fd0148e38bb0d87a4439063..444529f8c2bb8baf348b8d5799da485d6bd6693b 100644 (file)
--- a/tornado/test/concurrent_test.py
+++ b/tornado/test/concurrent_test.py
@@ -18,6 +18,7 @@ from concurrent import futures
 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
@@ -25,7 +26,6 @@ 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):

diff --git a/tornado/test/curl_httpclient_test.py b/tornado/test/curl_httpclient_test.py
index 52c42c8b1f6040c93a440329619413647a436a00..4d371adff37d0dc3ca526c43c0429f696d6ae2c1 100644 (file)
--- a/tornado/test/curl_httpclient_test.py
+++ b/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
 
 

diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py
index f2f2902a0ad439684f3a0ec087321c40d6ed944f..a7f0491b8116e340b108c5663830907ab1791b24 100644 (file)
--- a/tornado/test/escape_test.py
+++ b/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)

diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py
index 8fc09de5c536eb1f9eef7b4742eb0f46ec07d4cf..d3881a9b844448d300b8a6af8614d1eeaad57665 100644 (file)
--- a/tornado/test/gen_test.py
+++ b/tornado/test/gen_test.py
@@ -8,11 +8,12 @@ import platform
 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

diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
index abecd0c0806161bf5e79e4d5dd6b3185c2e5047e..a9212e89fad387da92a53b45581d106ab0b25224 100644 (file)
--- a/tornado/test/httpclient_test.py
+++ b/tornado/test/httpclient_test.py
@@ -10,6 +10,7 @@ import datetime
 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.iostream import IOStream
 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
 

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 8d21bbdc946969057ed5369f64fcb751684e904b..6f4389abf8607538a4a805f89b4ede60b15d754e 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -13,7 +13,7 @@ from tornado.log import gen_log
 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 socket
 import ssl
 import sys
 import tempfile
+import unittest
 from io import BytesIO
 
 

diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
index 7b8f660807e57d13e2c86805ed38331043e175e6..b1fb468d96182e8a9496faa08e83d247a979f1c3 100644 (file)
--- a/tornado/test/httputil_test.py
+++ b/tornado/test/httputil_test.py
@@ -9,7 +9,6 @@ from tornado.httputil import (
 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
@@ -17,6 +16,7 @@ import logging
 import pickle
 import time
 import urllib.parse
+import unittest
 
 
 class TestUrlConcat(unittest.TestCase):

diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py
index 439f0f7a41791673f8996f000b8a5906f7668d2b..be5b3123644bd620a16e7d4e0c70aa5dc105dc86 100644 (file)
--- a/tornado/test/import_test.py
+++ b/tornado/test/import_test.py
@@ -3,8 +3,7 @@ from __future__ import absolute_import, division, print_function
 
 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

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index f472525574de3e8aaf2e0af2c395e711b75bb044..6f886cca78a414144bb7b082f878d23cc8bad67d 100644 (file)
--- a/tornado/test/ioloop_test.py
+++ b/tornado/test/ioloop_test.py
@@ -12,13 +12,14 @@ import threading
 import time
 import types
 from unittest import mock
+import unittest
 
 from tornado.escape import native_str
 from tornado import gen
 from tornado.ioloop import IOLoop, TimeoutError, PeriodicCallback
 from tornado.log import app_log
 from tornado.testing import AsyncTestCase, bind_unused_port, ExpectLog, gen_test
-from tornado.test.util import unittest, skipIfNonUnix, skipOnTravis
+from tornado.test.util import skipIfNonUnix, skipOnTravis
 
 
 class TestIOLoop(AsyncTestCase):

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
index e012f09955e7832d37b63e91fed687b48af25e00..f87bbf8477e759747585120631fbb091baebe49a 100644 (file)
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@ -9,7 +9,7 @@ from tornado.log import gen_log
 from tornado.netutil import ssl_wrap_socket
 from tornado.tcpserver import TCPServer
 from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase, AsyncTestCase, bind_unused_port, ExpectLog, gen_test  # noqa: E501
-from tornado.test.util import unittest, skipIfNonUnix, refusing_port, skipPypy3V58
+from tornado.test.util import skipIfNonUnix, refusing_port, skipPypy3V58
 from tornado.web import RequestHandler, Application
 import errno
 import hashlib
@@ -20,6 +20,7 @@ import socket
 import ssl
 import sys
 from unittest import mock
+import unittest
 
 
 def _server_ssl_options():

diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py
index c392049becb329c1944043bf7337148e76d37fe9..db5d4838a8bc630368b56670575f33c0176372e8 100644 (file)
--- a/tornado/test/locale_test.py
+++ b/tornado/test/locale_test.py
@@ -4,10 +4,10 @@ import datetime
 import os
 import shutil
 import tempfile
+import unittest
 
 import tornado.locale
 from tornado.escape import utf8, to_unicode
-from tornado.test.util import unittest
 from tornado.util import unicode_type
 
 

diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py
index dcfaaf15e1a811a40a4b3da92d1776889aa1245e..5e7cfb0b3adc938471fce16375688f4859744f13 100644 (file)
--- a/tornado/test/locks_test.py
+++ b/tornado/test/locks_test.py
@@ -13,11 +13,11 @@
 
 from __future__ import absolute_import, division, print_function
 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):

diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py
index 48519c3c3c9577cffcfd4cb73b2477dba016f938..03302d6ccacd28a4932c5904630921b12d6f5d29 100644 (file)
--- a/tornado/test/log_test.py
+++ b/tornado/test/log_test.py
@@ -22,12 +22,12 @@ import re
 import subprocess
 import sys
 import tempfile
+import unittest
 import warnings
 
 from tornado.escape import utf8
 from tornado.log import LogFormatter, define_logging_options, enable_pretty_logging
 from tornado.options import OptionParser
-from tornado.test.util import unittest
 from tornado.util import basestring_type
 
 

diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
index 2f88464709224e73e5244e6500cea4cf3748bb90..0637dea61f76be4096d1885fd73666d198692bbf 100644 (file)
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
@@ -7,12 +7,13 @@ import socket
 from subprocess import Popen
 import sys
 import time
+import unittest
 
 from tornado.netutil import (
     BlockingResolver, OverrideResolver, ThreadedResolver, is_valid_ip, bind_sockets
 )
 from tornado.testing import AsyncTestCase, gen_test, bind_unused_port
-from tornado.test.util import unittest, skipIfNoNetwork
+from tornado.test.util import skipIfNoNetwork
 
 try:
     import pycares  # type: ignore

diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py
index 8263faf5d03eefcc60a6a30f0791c0142c7f0518..e6c81f5803acb75ede67df719df785b47a138f4b 100644 (file)
--- a/tornado/test/options_test.py
+++ b/tornado/test/options_test.py
@@ -6,10 +6,11 @@ from io import StringIO
 import os
 import sys
 from unittest import mock
+import unittest
 
 from tornado.options import OptionParser, Error
 from tornado.util import basestring_type
-from tornado.test.util import unittest, subTest
+from tornado.test.util import subTest
 
 
 class Email(object):

diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py
index a2871e2b8dfb31ceeb5b7468fdb116d9f513536c..d12ac36b0cf12b9408918bea54d90d1550e60380 100644 (file)
--- a/tornado/test/process_test.py
+++ b/tornado/test/process_test.py
@@ -6,6 +6,7 @@ import os
 import signal
 import subprocess
 import sys
+import unittest
 
 from tornado.httpclient import HTTPClient, HTTPError
 from tornado.httpserver import HTTPServer
@@ -14,7 +15,7 @@ from tornado.log import gen_log
 from tornado.process import fork_processes, task_id, Subprocess
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.testing import bind_unused_port, ExpectLog, AsyncTestCase, gen_test
-from tornado.test.util import unittest, skipIfNonUnix
+from tornado.test.util import skipIfNonUnix
 from tornado.web import RequestHandler, Application
 
 

diff --git a/tornado/test/queues_test.py b/tornado/test/queues_test.py
index e08e04759fe936a0f52b53af439cfc338e9c46bf..5aaaf51e682f7b178b16737c094845c63d2338cc 100644 (file)
--- a/tornado/test/queues_test.py
+++ b/tornado/test/queues_test.py
@@ -14,11 +14,11 @@
 from __future__ import absolute_import, division, print_function
 from datetime import timedelta
 from random import random
+import unittest
 
 from tornado import gen, queues
 from tornado.gen import TimeoutError
 from tornado.testing import gen_test, AsyncTestCase
-from tornado.test.util import unittest
 
 
 class QueueBasicTest(AsyncTestCase):

diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index dbba4c253328d8120bd8366eba66350e33710f86..b9f797c75771de79f0899999ca0cd9ea6d3b33d9 100644 (file)
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -8,12 +8,12 @@ import logging
 import operator
 import textwrap
 import sys
+import unittest
 
 from tornado.httpclient import AsyncHTTPClient
 from tornado.httpserver import HTTPServer
 from tornado.netutil import Resolver
 from tornado.options import define, add_parse_callback
-from tornado.test.util import unittest
 
 
 TEST_MODULES = [

diff --git a/tornado/test/tcpclient_test.py b/tornado/test/tcpclient_test.py
index d7de42237f3abbacfaf23fc0d228ae7323d146c9..97996177c309198a204a382622a7372190485bec 100644 (file)
--- a/tornado/test/tcpclient_test.py
+++ b/tornado/test/tcpclient_test.py
@@ -18,6 +18,7 @@ from __future__ import absolute_import, division, print_function
 from contextlib import closing
 import os
 import socket
+import unittest
 
 from tornado.concurrent import Future
 from tornado.netutil import bind_sockets, Resolver
@@ -25,7 +26,7 @@ from tornado.queues import Queue
 from tornado.tcpclient import TCPClient, _Connector
 from tornado.tcpserver import TCPServer
 from tornado.testing import AsyncTestCase, gen_test
-from tornado.test.util import skipIfNoIPv6, unittest, refusing_port, skipIfNonUnix
+from tornado.test.util import skipIfNoIPv6, refusing_port, skipIfNonUnix
 from tornado.gen import TimeoutError
 
 # Fake address families for testing.  Used in place of AF_INET

diff --git a/tornado/test/tcpserver_test.py b/tornado/test/tcpserver_test.py
index a5c6af3c0418a94b7964790be38691e5e0a6ff28..95e21775c61440d2d9e19dc98c2000221f3182f7 100644 (file)
--- a/tornado/test/tcpserver_test.py
+++ b/tornado/test/tcpserver_test.py
@@ -4,13 +4,14 @@ import socket
 import subprocess
 import sys
 import textwrap
+import unittest
 
 from tornado.escape import utf8, to_unicode
 from tornado import gen
 from tornado.iostream import IOStream
 from tornado.log import app_log
 from tornado.tcpserver import TCPServer
-from tornado.test.util import skipIfNonUnix, unittest
+from tornado.test.util import skipIfNonUnix
 from tornado.testing import AsyncTestCase, ExpectLog, bind_unused_port, gen_test
 
 

diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py
index 0aaee67c2a35bb5665641667a239854d333e7071..bd900db006319c6735e89fe3176d8f168c11b136 100644 (file)
--- a/tornado/test/template_test.py
+++ b/tornado/test/template_test.py
@@ -3,10 +3,10 @@ from __future__ import absolute_import, division, print_function
 import os
 import sys
 import traceback
+import unittest
 
 from tornado.escape import utf8, native_str, to_unicode
 from tornado.template import Template, DictLoader, ParseError, Loader
-from tornado.test.util import unittest
 from tornado.util import ObjectDict
 
 

diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
index ece299c54ccfea88e0448bea7b4a188399256fab..c4e7ebd2b427e7d6a69ea356d42479839a119526 100644 (file)
--- a/tornado/test/testing_test.py
+++ b/tornado/test/testing_test.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import, division, print_function
 
 from tornado import gen, ioloop
 from tornado.httpserver import HTTPServer
-from tornado.test.util import unittest
 from tornado.testing import AsyncHTTPTestCase, AsyncTestCase, bind_unused_port, gen_test
 from tornado.web import Application
 import asyncio
@@ -10,6 +9,7 @@ import contextlib
 import os
 import platform
 import traceback
+import unittest
 import warnings
 
 

diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index a28605deb91da78ecb3d4f56fc56f4c951f20545..06ed4f0588576328a42bebe9249918cfb688a49d 100644 (file)
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -21,6 +21,7 @@ from __future__ import absolute_import, division, print_function
 
 import logging
 import signal
+import unittest
 import warnings
 
 from tornado.escape import utf8
@@ -29,7 +30,6 @@ from tornado.httpclient import AsyncHTTPClient
 from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 from tornado.testing import bind_unused_port, AsyncTestCase, gen_test
-from tornado.test.util import unittest
 from tornado.web import RequestHandler, Application
 
 try:

diff --git a/tornado/test/util.py b/tornado/test/util.py
index 4da76644595df5a606bea64289886eb5b35e2f5e..1c8f91f6c468a7c7664b93ea2aa0b3d297423e4f 100644 (file)
--- a/tornado/test/util.py
+++ b/tornado/test/util.py
@@ -6,13 +6,11 @@ import platform
 import socket
 import sys
 import textwrap
+import unittest
 import warnings
 
 from tornado.testing import bind_unused_port
 
-# Delegate the choice of unittest or unittest2 to tornado.testing.
-from tornado.testing import unittest
-
 skipIfNonUnix = unittest.skipIf(os.name != 'posix' or sys.platform == 'cygwin',
                                 "non-unix platform")
 

diff --git a/tornado/test/util_test.py b/tornado/test/util_test.py
index d6d01d5d661a5c1a1c20b2c40b780bc7a0c3cf77..1b7b82abf9b97c5d3aa1474bcc3e1e4485bc33f1 100644 (file)
--- a/tornado/test/util_test.py
+++ b/tornado/test/util_test.py
@@ -4,10 +4,10 @@ from io import StringIO
 import re
 import sys
 import datetime
+import unittest
 
 import tornado.escape
 from tornado.escape import utf8
-from tornado.test.util import unittest
 from tornado.util import (
     raise_exc_info, Configurable, exec_in, ArgReplacer,
     timedelta_to_seconds, import_object, re_unescape, is_finalizing

diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index f8b5e86b96758833f7835af492bfd17f9ae7b969..7bc3c055b798d44a96f1f8770460c70847919689 100644 (file)
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -12,7 +12,6 @@ from tornado.log import app_log, gen_log
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.template import DictLoader
 from tornado.testing import AsyncHTTPTestCase, AsyncTestCase, ExpectLog, gen_test
-from tornado.test.util import unittest
 from tornado.util import ObjectDict, unicode_type
 from tornado.web import (
     Application, RequestHandler, StaticFileHandler, RedirectHandler as WebRedirectHandler,
@@ -33,6 +32,7 @@ import logging
 import os
 import re
 import socket
+import unittest
 import urllib.parse
 
 

diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
index a6bb3ee0c65f5c8e4af501f4b638ccee5251a492..8aa3d0d962bddf9196458c28926f9f9e507a3a86 100644 (file)
--- a/tornado/test/websocket_test.py
+++ b/tornado/test/websocket_test.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, division, print_function
 
 import functools
 import traceback
+import unittest
 
 from tornado.concurrent import Future
 from tornado import gen
@@ -11,7 +12,6 @@ from tornado.log import gen_log, app_log
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.template import DictLoader
 from tornado.testing import AsyncHTTPTestCase, gen_test, bind_unused_port, ExpectLog
-from tornado.test.util import unittest
 from tornado.web import Application, RequestHandler
 
 try:

diff --git a/tox.ini b/tox.ini
index d60a1059520f71e2a49feff2fd9cbbba02d1ee99..84c631ce9a21818156efbd1e27e5c20acce7a25a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,6 @@ envlist =
         # Other configurations; see comments below.
         py3-opt,
         py3-{lang_c,lang_utf8},
-        py3-unittest2,
 
         # Ensure the sphinx build has no errors or warnings
         py3-sphinx-docs,
@@ -53,9 +52,6 @@ basepython =
            py3: python3.7
 
 deps =
-     # unittest2 doesn't add anything we need on py3, but we should ensure that
-     # its existence doesn't break anything due to conditional imports.
-     py3-unittest2: unittest2py3k
      # cpython-only deps: pycurl installs but curl_httpclient doesn't work;
      # twisted mostly works but is a bit flaky under pypy.
      {py35,py36,py37}-full: pycurl