From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 14 Jul 2018 15:26:33 +0000 (-0400)
Subject: test: Remove legacy unittest2 compatibility cruft
X-Git-Tag: v6.0.0b1~48^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fc9998ae221e2b119829cbd4ee504c861d85ba6;p=thirdparty%2Ftornado.git

test: Remove legacy unittest2 compatibility cruft
---

diff --git a/tornado/test/asyncio_test.py b/tornado/test/asyncio_test.py
index 59b0c5233..23073090d 100644
--- 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 5cbdc2ee1..bac17fa66 100644
--- 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 885ae5807..444529f8c 100644
--- 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 52c42c8b1..4d371adff 100644
--- 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 f2f2902a0..a7f0491b8 100644
--- 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 8fc09de5c..d3881a9b8 100644
--- 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 abecd0c08..a9212e89f 100644
--- 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 8d21bbdc9..6f4389abf 100644
--- 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 7b8f66080..b1fb468d9 100644
--- 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 439f0f7a4..be5b31236 100644
--- 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 f47252557..6f886cca7 100644
--- 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 e012f0995..f87bbf847 100644
--- 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 c392049be..db5d4838a 100644
--- 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 dcfaaf15e..5e7cfb0b3 100644
--- 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 48519c3c3..03302d6cc 100644
--- 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 2f8846470..0637dea61 100644
--- 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 8263faf5d..e6c81f580 100644
--- 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 a2871e2b8..d12ac36b0 100644
--- 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 e08e04759..5aaaf51e6 100644
--- 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 dbba4c253..b9f797c75 100644
--- 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 d7de42237..97996177c 100644
--- 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 a5c6af3c0..95e21775c 100644
--- 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 0aaee67c2..bd900db00 100644
--- 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 ece299c54..c4e7ebd2b 100644
--- 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 a28605deb..06ed4f058 100644
--- 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 4da766445..1c8f91f6c 100644
--- 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 d6d01d5d6..1b7b82abf 100644
--- 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 f8b5e86b9..7bc3c055b 100644
--- 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 a6bb3ee0c..8aa3d0d96 100644
--- 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 d60a10595..84c631ce9 100644
--- 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