From: Ben Darnell Date: Sat, 14 Jul 2018 15:46:28 +0000 (-0400) Subject: *: Remove Python2 __future__ imports throughout the codebase X-Git-Tag: v6.0.0b1~48^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e332a7de7e340a868e96cb1fdb82ab6565d48a77;p=thirdparty%2Ftornado.git *: Remove Python2 __future__ imports throughout the codebase --- diff --git a/demos/file_upload/file_uploader.py b/demos/file_upload/file_uploader.py index 9f1f84d51..179eb248e 100755 --- a/demos/file_upload/file_uploader.py +++ b/demos/file_upload/file_uploader.py @@ -9,7 +9,6 @@ single file without encoding. See also file_receiver.py in this directory, a server that receives uploads. """ -from __future__ import print_function import mimetypes import os import sys diff --git a/demos/tcpecho/client.py b/demos/tcpecho/client.py index 51d3a8d5f..a2ead08bc 100755 --- a/demos/tcpecho/client.py +++ b/demos/tcpecho/client.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function from tornado.ioloop import IOLoop from tornado import gen from tornado.tcpclient import TCPClient diff --git a/maint/circlerefs/circlerefs.py b/maint/circlerefs/circlerefs.py index 5cc4e1f6d..bd8214aa8 100755 --- a/maint/circlerefs/circlerefs.py +++ b/maint/circlerefs/circlerefs.py @@ -7,7 +7,6 @@ path from being used and instead rely on the slower full GC. This increases memory footprint and CPU overhead, so we try to eliminate circular references created by normal operation. """ -from __future__ import print_function import gc import traceback diff --git a/maint/scripts/test_resolvers.py b/maint/scripts/test_resolvers.py index 2a466c1ac..82dec30e6 100755 --- a/maint/scripts/test_resolvers.py +++ b/maint/scripts/test_resolvers.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function - import pprint import socket diff --git a/maint/vm/windows/bootstrap.py b/maint/vm/windows/bootstrap.py index 281bf573c..9bfb5c723 100755 --- a/maint/vm/windows/bootstrap.py +++ b/maint/vm/windows/bootstrap.py @@ -21,7 +21,6 @@ To run the tests with tox, cd to e:\maint\vm\windows and run To run under cygwin (which must be installed separately), run cd /cygdrive/e; python -m tornado.test.runtests """ -from __future__ import absolute_import, division, print_function import os import subprocess diff --git a/tornado/__init__.py b/tornado/__init__.py index ae8fd9987..e6c450593 100644 --- a/tornado/__init__.py +++ b/tornado/__init__.py @@ -15,8 +15,6 @@ """The Tornado web server and tools.""" -from __future__ import absolute_import, division, print_function - # version is a human-readable version number. # version_info is a four-tuple for programmatic comparison. The first diff --git a/tornado/_locale_data.py b/tornado/_locale_data.py index a2c503907..91416d9b4 100644 --- a/tornado/_locale_data.py +++ b/tornado/_locale_data.py @@ -16,8 +16,6 @@ """Data used by the tornado.locale module.""" -from __future__ import absolute_import, division, print_function - LOCALE_NAMES = { "af_ZA": {"name_en": u"Afrikaans", "name": u"Afrikaans"}, "am_ET": {"name_en": u"Amharic", "name": u"አማርኛ"}, diff --git a/tornado/auth.py b/tornado/auth.py index a3fd7943c..35d5ee203 100644 --- a/tornado/auth.py +++ b/tornado/auth.py @@ -56,8 +56,6 @@ Example usage for Google OAuth: """ -from __future__ import absolute_import, division, print_function - import base64 import binascii import hashlib diff --git a/tornado/autoreload.py b/tornado/autoreload.py index 9c5b2326b..01951fccf 100644 --- a/tornado/autoreload.py +++ b/tornado/autoreload.py @@ -43,8 +43,6 @@ incorrectly. """ -from __future__ import absolute_import, division, print_function - import os import sys diff --git a/tornado/concurrent.py b/tornado/concurrent.py index 37d58e865..7c2679dd2 100644 --- a/tornado/concurrent.py +++ b/tornado/concurrent.py @@ -26,7 +26,6 @@ While this package is an important part of Tornado's internal implementation, applications rarely need to interact with it directly. """ -from __future__ import absolute_import, division, print_function import asyncio from concurrent import futures diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py index b412897f6..13e1f136c 100644 --- a/tornado/curl_httpclient.py +++ b/tornado/curl_httpclient.py @@ -15,8 +15,6 @@ """Non-blocking HTTP client implementation using pycurl.""" -from __future__ import absolute_import, division, print_function - import collections import functools import logging diff --git a/tornado/escape.py b/tornado/escape.py index 6ca81584e..382133f5b 100644 --- a/tornado/escape.py +++ b/tornado/escape.py @@ -19,8 +19,6 @@ Also includes a few other miscellaneous string manipulation functions that have crept in over time. """ -from __future__ import absolute_import, division, print_function - import html.entities import json import re diff --git a/tornado/gen.py b/tornado/gen.py index e5ff49832..982cb8dfc 100644 --- a/tornado/gen.py +++ b/tornado/gen.py @@ -70,8 +70,6 @@ See the `convert_yielded` function to extend this mechanism. via ``singledispatch``. """ -from __future__ import absolute_import, division, print_function - import asyncio import builtins import collections diff --git a/tornado/http1connection.py b/tornado/http1connection.py index fba9cb9bf..0002f857b 100644 --- a/tornado/http1connection.py +++ b/tornado/http1connection.py @@ -18,8 +18,6 @@ .. versionadded:: 4.0 """ -from __future__ import absolute_import, division, print_function - import re from tornado.concurrent import (Future, future_add_done_callback, diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 7c2f2568a..d3a42cd37 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -38,8 +38,6 @@ To select ``curl_httpclient``, call `AsyncHTTPClient.configure` at startup:: AsyncHTTPClient.configure("tornado.curl_httpclient.CurlAsyncHTTPClient") """ -from __future__ import absolute_import, division, print_function - import functools import time import weakref diff --git a/tornado/httpserver.py b/tornado/httpserver.py index 3498d71fb..0269b045e 100644 --- a/tornado/httpserver.py +++ b/tornado/httpserver.py @@ -25,8 +25,6 @@ class except to start a server at the beginning of the process to `tornado.httputil.HTTPServerRequest`. The old name remains as an alias. """ -from __future__ import absolute_import, division, print_function - import socket from tornado.escape import native_str diff --git a/tornado/httputil.py b/tornado/httputil.py index 48c545ed5..0e498235b 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -19,8 +19,6 @@ This module also defines the `HTTPServerRequest` class which is exposed via `tornado.web.RequestHandler.request`. """ -from __future__ import absolute_import, division, print_function - import calendar import collections import copy diff --git a/tornado/ioloop.py b/tornado/ioloop.py index 2f9319f7b..51dbe4540 100644 --- a/tornado/ioloop.py +++ b/tornado/ioloop.py @@ -30,8 +30,6 @@ events. `IOLoop.add_timeout` is a non-blocking alternative to """ -from __future__ import absolute_import, division, print_function - import asyncio from concurrent.futures import ThreadPoolExecutor import datetime diff --git a/tornado/iostream.py b/tornado/iostream.py index da6817349..ba8284f3f 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -23,8 +23,6 @@ Contents: * `PipeIOStream`: Pipe-based IOStream implementation. """ -from __future__ import absolute_import, division, print_function - import collections import errno import io diff --git a/tornado/locale.py b/tornado/locale.py index 2931010ce..9247bcb52 100644 --- a/tornado/locale.py +++ b/tornado/locale.py @@ -39,8 +39,6 @@ supported by `gettext` and related tools). If neither method is called, the `Locale.translate` method will simply return the original string. """ -from __future__ import absolute_import, division, print_function - import codecs import csv import datetime diff --git a/tornado/locks.py b/tornado/locks.py index 9566a4573..15b8f4d87 100644 --- a/tornado/locks.py +++ b/tornado/locks.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function - import collections from concurrent.futures import CancelledError diff --git a/tornado/log.py b/tornado/log.py index cda905c9b..c0171ba16 100644 --- a/tornado/log.py +++ b/tornado/log.py @@ -27,8 +27,6 @@ These streams may be configured independently using the standard library's `logging` module. For example, you may wish to send ``tornado.access`` logs to a separate file for analysis. """ -from __future__ import absolute_import, division, print_function - import logging import logging.handlers import sys diff --git a/tornado/netutil.py b/tornado/netutil.py index c7682be3a..c57f6fd34 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -15,8 +15,6 @@ """Miscellaneous network utility code.""" -from __future__ import absolute_import, division, print_function - import errno import os import sys diff --git a/tornado/options.py b/tornado/options.py index f3b87199b..f2d30a6e8 100644 --- a/tornado/options.py +++ b/tornado/options.py @@ -93,8 +93,6 @@ instances to define isolated sets of options, such as for subcommands. underscores. """ -from __future__ import absolute_import, division, print_function - import datetime import numbers import re diff --git a/tornado/platform/asyncio.py b/tornado/platform/asyncio.py index 04254bed3..b139c9002 100644 --- a/tornado/platform/asyncio.py +++ b/tornado/platform/asyncio.py @@ -19,7 +19,6 @@ the same event loop. Windows. Use the `~asyncio.SelectorEventLoop` instead. """ -from __future__ import absolute_import, division, print_function import functools from tornado.gen import convert_yielded diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py index 16ee9091a..6c3100170 100644 --- a/tornado/platform/auto.py +++ b/tornado/platform/auto.py @@ -22,8 +22,6 @@ Most code that needs access to this functionality should do e.g.:: from tornado.platform.auto import set_close_exec """ -from __future__ import absolute_import, division, print_function - import os if os.name == 'nt': diff --git a/tornado/platform/caresresolver.py b/tornado/platform/caresresolver.py index 768cb6249..f1e379b22 100644 --- a/tornado/platform/caresresolver.py +++ b/tornado/platform/caresresolver.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function import pycares # type: ignore import socket diff --git a/tornado/platform/interface.py b/tornado/platform/interface.py index c2d54e4ce..d7a6d76ee 100644 --- a/tornado/platform/interface.py +++ b/tornado/platform/interface.py @@ -20,8 +20,6 @@ for other tornado.platform modules. Most code should import the appropriate implementation from `tornado.platform.auto`. """ -from __future__ import absolute_import, division, print_function - def set_close_exec(fd): """Sets the close-on-exec bit (``FD_CLOEXEC``)for a file descriptor.""" diff --git a/tornado/platform/posix.py b/tornado/platform/posix.py index c8571e6b0..54327746c 100644 --- a/tornado/platform/posix.py +++ b/tornado/platform/posix.py @@ -15,8 +15,6 @@ """Posix implementations of platform-specific functionality.""" -from __future__ import absolute_import, division, print_function - import fcntl import os diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py index a5f41ab6b..68646b300 100644 --- a/tornado/platform/twisted.py +++ b/tornado/platform/twisted.py @@ -21,8 +21,6 @@ depending on which library's underlying event loop you want to use. This module has been tested with Twisted versions 11.0.0 and newer. """ -from __future__ import absolute_import, division, print_function - import socket import sys diff --git a/tornado/platform/windows.py b/tornado/platform/windows.py index 412770065..274937f86 100644 --- a/tornado/platform/windows.py +++ b/tornado/platform/windows.py @@ -1,8 +1,6 @@ # NOTE: win32 support is currently experimental, and not recommended # for production use. - -from __future__ import absolute_import, division, print_function import ctypes # type: ignore import ctypes.wintypes # type: ignore diff --git a/tornado/process.py b/tornado/process.py index 7a5fbaed0..8f8dd3e07 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -17,8 +17,6 @@ the server into multiple processes and managing subprocesses. """ -from __future__ import absolute_import, division, print_function - import errno import os import multiprocessing diff --git a/tornado/queues.py b/tornado/queues.py index 7cb96bfcc..bc3338447 100644 --- a/tornado/queues.py +++ b/tornado/queues.py @@ -25,8 +25,6 @@ to those provided in the standard library's `asyncio package """ -from __future__ import absolute_import, division, print_function - import collections import heapq diff --git a/tornado/routing.py b/tornado/routing.py index e56d1a75f..8122faf5b 100644 --- a/tornado/routing.py +++ b/tornado/routing.py @@ -175,8 +175,6 @@ For more information on application-level routing see docs for `~.web.Applicatio """ -from __future__ import absolute_import, division, print_function - import re from functools import partial diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py index bf41abbf1..d0df55271 100644 --- a/tornado/simple_httpclient.py +++ b/tornado/simple_httpclient.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from tornado.escape import _unicode from tornado import gen from tornado.httpclient import HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy diff --git a/tornado/tcpclient.py b/tornado/tcpclient.py index e726f5106..94dcdf150 100644 --- a/tornado/tcpclient.py +++ b/tornado/tcpclient.py @@ -15,7 +15,6 @@ """A non-blocking TCP connection factory. """ -from __future__ import absolute_import, division, print_function import functools import socket diff --git a/tornado/tcpserver.py b/tornado/tcpserver.py index 31e16b8df..038d8223c 100644 --- a/tornado/tcpserver.py +++ b/tornado/tcpserver.py @@ -14,7 +14,6 @@ # under the License. """A non-blocking, single-threaded TCP server.""" -from __future__ import absolute_import, division, print_function import errno import os diff --git a/tornado/template.py b/tornado/template.py index 382f08f40..ac5dcf888 100644 --- a/tornado/template.py +++ b/tornado/template.py @@ -195,8 +195,6 @@ if you need to include a literal ``{{``, ``{%``, or ``{#`` in the output. `filter_whitespace` for available options. New in Tornado 4.3. """ -from __future__ import absolute_import, division, print_function - import datetime from io import StringIO import linecache diff --git a/tornado/test/__main__.py b/tornado/test/__main__.py index c78478cbd..430c895fa 100644 --- a/tornado/test/__main__.py +++ b/tornado/test/__main__.py @@ -2,8 +2,6 @@ This only works in python 2.7+. """ -from __future__ import absolute_import, division, print_function - from tornado.test.runtests import all, main # tornado.testing.main autodiscovery relies on 'all' being present in diff --git a/tornado/test/asyncio_test.py b/tornado/test/asyncio_test.py index 23073090d..990ecc906 100644 --- a/tornado/test/asyncio_test.py +++ b/tornado/test/asyncio_test.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function - import asyncio import unittest diff --git a/tornado/test/auth_test.py b/tornado/test/auth_test.py index ee5ee7a7b..eba46a6d4 100644 --- a/tornado/test/auth_test.py +++ b/tornado/test/auth_test.py @@ -3,9 +3,6 @@ # and ensure that it doesn't blow up (e.g. with unicode/bytes issues in # python 3) - -from __future__ import absolute_import, division, print_function - from tornado.auth import ( OpenIdMixin, OAuthMixin, OAuth2Mixin, GoogleOAuth2Mixin, FacebookGraphMixin, TwitterMixin, diff --git a/tornado/test/autoreload_test.py b/tornado/test/autoreload_test.py index bac17fa66..6c62b3308 100644 --- a/tornado/test/autoreload_test.py +++ b/tornado/test/autoreload_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function import os import shutil import subprocess diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py index 444529f8c..9dbccbeee 100644 --- a/tornado/test/concurrent_test.py +++ b/tornado/test/concurrent_test.py @@ -12,8 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function - from concurrent import futures import logging import re diff --git a/tornado/test/curl_httpclient_test.py b/tornado/test/curl_httpclient_test.py index 4d371adff..b93e97123 100644 --- a/tornado/test/curl_httpclient_test.py +++ b/tornado/test/curl_httpclient_test.py @@ -1,6 +1,4 @@ # coding: utf-8 -from __future__ import absolute_import, division, print_function - from hashlib import md5 import unittest diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py index a7f0491b8..6881850dd 100644 --- a/tornado/test/escape_test.py +++ b/tornado/test/escape_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import unittest import tornado.escape diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py index d3881a9b8..9e6cb095e 100644 --- a/tornado/test/gen_test.py +++ b/tornado/test/gen_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import asyncio from concurrent import futures import gc diff --git a/tornado/test/gettext_translations/extract_me.py b/tornado/test/gettext_translations/extract_me.py index 283c13f41..08b29bc53 100644 --- a/tornado/test/gettext_translations/extract_me.py +++ b/tornado/test/gettext_translations/extract_me.py @@ -8,7 +8,6 @@ # 3) msgfmt tornado_test.po -o tornado_test.mo # 4) Put the file in the proper location: $LANG/LC_MESSAGES -from __future__ import absolute_import, division, print_function _("school") pgettext("law", "right") pgettext("good", "right") diff --git a/tornado/test/http1connection_test.py b/tornado/test/http1connection_test.py index 8aaaaf35b..4d8c04bc5 100644 --- a/tornado/test/http1connection_test.py +++ b/tornado/test/http1connection_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import socket from tornado.http1connection import HTTP1Connection diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py index a9212e89f..578f1f39d 100644 --- a/tornado/test/httpclient_test.py +++ b/tornado/test/httpclient_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function - import base64 import binascii from contextlib import closing diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py index 6f4389abf..3b1e23470 100644 --- a/tornado/test/httpserver_test.py +++ b/tornado/test/httpserver_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from tornado import gen, netutil from tornado.concurrent import Future from tornado.escape import json_decode, json_encode, utf8, _unicode, recursive_unicode, native_str diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py index b1fb468d9..cec6017fe 100644 --- a/tornado/test/httputil_test.py +++ b/tornado/test/httputil_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function - from tornado.httputil import ( url_concat, parse_multipart_form_data, HTTPHeaders, format_timestamp, HTTPServerRequest, parse_request_start_line, parse_cookie, qs_to_qsl, diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py index be5b31236..2f360d082 100644 --- a/tornado/test/import_test.py +++ b/tornado/test/import_test.py @@ -1,6 +1,4 @@ # flake8: noqa -from __future__ import absolute_import, division, print_function - import subprocess import sys import unittest diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index 6f886cca7..fc0011cf4 100644 --- a/tornado/test/ioloop_test.py +++ b/tornado/test/ioloop_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from concurrent.futures import ThreadPoolExecutor from concurrent import futures import contextlib diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py index f87bbf847..9c6dbf76e 100644 --- a/tornado/test/iostream_test.py +++ b/tornado/test/iostream_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function from tornado.concurrent import Future from tornado import gen from tornado import netutil diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py index db5d4838a..67ed123b9 100644 --- a/tornado/test/locale_test.py +++ b/tornado/test/locale_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import datetime import os import shutil diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py index 5e7cfb0b3..1306e06c9 100644 --- a/tornado/test/locks_test.py +++ b/tornado/test/locks_test.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import, division, print_function from datetime import timedelta import unittest diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py index 03302d6cc..ccd38dad6 100644 --- a/tornado/test/log_test.py +++ b/tornado/test/log_test.py @@ -12,8 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function - import contextlib import glob import logging diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py index 0637dea61..6686e9fba 100644 --- a/tornado/test/netutil_test.py +++ b/tornado/test/netutil_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import errno import os import signal diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py index e6c81f580..e38db0800 100644 --- a/tornado/test/options_test.py +++ b/tornado/test/options_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function - import datetime from io import StringIO import os diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index d12ac36b0..e8ac81a3c 100644 --- a/tornado/test/process_test.py +++ b/tornado/test/process_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import asyncio import logging import os diff --git a/tornado/test/queues_test.py b/tornado/test/queues_test.py index 5aaaf51e6..d63882a9d 100644 --- a/tornado/test/queues_test.py +++ b/tornado/test/queues_test.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import, division, print_function from datetime import timedelta from random import random import unittest diff --git a/tornado/test/resolve_test_helper.py b/tornado/test/resolve_test_helper.py index 429671962..a055280d1 100644 --- a/tornado/test/resolve_test_helper.py +++ b/tornado/test/resolve_test_helper.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function from tornado.ioloop import IOLoop from tornado.netutil import ThreadedResolver diff --git a/tornado/test/routing_test.py b/tornado/test/routing_test.py index 3cb34ad78..722662555 100644 --- a/tornado/test/routing_test.py +++ b/tornado/test/routing_test.py @@ -10,9 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import, division, print_function - from tornado.httputil import HTTPHeaders, HTTPMessageDelegate, HTTPServerConnectionDelegate, ResponseStartLine # noqa: E501 from tornado.routing import HostMatches, PathMatches, ReversibleRouter, Router, Rule, RuleRouter from tornado.testing import AsyncHTTPTestCase diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py index b9f797c75..f7b7cbe81 100644 --- a/tornado/test/runtests.py +++ b/tornado/test/runtests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from functools import reduce import gc import io diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index 82853f390..d9ea96b77 100644 --- a/tornado/test/simple_httpclient_test.py +++ b/tornado/test/simple_httpclient_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import collections from contextlib import closing import errno diff --git a/tornado/test/tcpclient_test.py b/tornado/test/tcpclient_test.py index 97996177c..df4eee9df 100644 --- a/tornado/test/tcpclient_test.py +++ b/tornado/test/tcpclient_test.py @@ -12,9 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import, division, print_function - from contextlib import closing import os import socket diff --git a/tornado/test/tcpserver_test.py b/tornado/test/tcpserver_test.py index 95e21775c..7408c780d 100644 --- a/tornado/test/tcpserver_test.py +++ b/tornado/test/tcpserver_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import socket import subprocess import sys @@ -141,7 +139,6 @@ class TestMultiprocess(unittest.TestCase): # As a sanity check, run the single-process version through this test # harness too. code = textwrap.dedent(""" - from __future__ import print_function from tornado.ioloop import IOLoop from tornado.tcpserver import TCPServer @@ -155,7 +152,6 @@ class TestMultiprocess(unittest.TestCase): def test_simple(self): code = textwrap.dedent(""" - from __future__ import print_function from tornado.ioloop import IOLoop from tornado.process import task_id from tornado.tcpserver import TCPServer @@ -171,7 +167,6 @@ class TestMultiprocess(unittest.TestCase): def test_advanced(self): code = textwrap.dedent(""" - from __future__ import print_function from tornado.ioloop import IOLoop from tornado.netutil import bind_sockets from tornado.process import fork_processes, task_id diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py index bd900db00..0d12a9ea0 100644 --- a/tornado/test/template_test.py +++ b/tornado/test/template_test.py @@ -1,7 +1,4 @@ -from __future__ import absolute_import, division, print_function - import os -import sys import traceback import unittest @@ -160,9 +157,12 @@ try{% set y = 1/x %} except ParseError: pass - @unittest.skipIf(sys.version_info >= division.getMandatoryRelease(), - 'no testable future imports') + @unittest.skip('no testable future imports') def test_no_inherit_future(self): + # TODO(bdarnell): make a test like this for one of the future + # imports available in python 3. Unfortunately they're harder + # to use in a template than division was. + # This file has from __future__ import division... self.assertEqual(1 / 2, 0.5) # ...but the template doesn't diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py index c4e7ebd2b..1e1c019b8 100644 --- a/tornado/test/testing_test.py +++ b/tornado/test/testing_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from tornado import gen, ioloop from tornado.httpserver import HTTPServer from tornado.testing import AsyncHTTPTestCase, AsyncTestCase, bind_unused_port, gen_test diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py index 06ed4f058..5d90272a8 100644 --- a/tornado/test/twisted_test.py +++ b/tornado/test/twisted_test.py @@ -17,8 +17,6 @@ Unittest for the twisted-style reactor. """ -from __future__ import absolute_import, division, print_function - import logging import signal import unittest diff --git a/tornado/test/util.py b/tornado/test/util.py index 1c8f91f6c..60e787b7d 100644 --- a/tornado/test/util.py +++ b/tornado/test/util.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import contextlib import os import platform diff --git a/tornado/test/util_test.py b/tornado/test/util_test.py index 1b7b82abf..a8c2cc094 100644 --- a/tornado/test/util_test.py +++ b/tornado/test/util_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import absolute_import, division, print_function from io import StringIO import re import sys @@ -193,10 +192,9 @@ class UnicodeLiteralTest(unittest.TestCase): class ExecInTest(unittest.TestCase): - # This test is python 2 only because there are no new future imports - # defined in python 3 yet. - @unittest.skipIf(sys.version_info >= print_function.getMandatoryRelease(), - 'no testable future imports') + # TODO(bdarnell): make a version of this test for one of the new + # future imports available in python 3. + @unittest.skip('no testable future imports') def test_no_inherit_future(self): # This file has from __future__ import print_function... f = StringIO() diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index 7bc3c055b..cb1ab353c 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - from tornado.concurrent import Future from tornado import gen from tornado.escape import json_decode, utf8, to_unicode, recursive_unicode, native_str, to_basestring # noqa: E501 diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py index 8aa3d0d96..23dc2805d 100644 --- a/tornado/test/websocket_test.py +++ b/tornado/test/websocket_test.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, print_function - import functools import traceback import unittest diff --git a/tornado/test/windows_test.py b/tornado/test/windows_test.py index 48faa5b5b..62a82dc12 100644 --- a/tornado/test/windows_test.py +++ b/tornado/test/windows_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function import functools import os import socket diff --git a/tornado/test/wsgi_test.py b/tornado/test/wsgi_test.py index 81ac01a58..f98da5bd7 100644 --- a/tornado/test/wsgi_test.py +++ b/tornado/test/wsgi_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function from wsgiref.validate import validator from tornado.testing import AsyncHTTPTestCase diff --git a/tornado/testing.py b/tornado/testing.py index 444b62f24..4521ea9cc 100644 --- a/tornado/testing.py +++ b/tornado/testing.py @@ -9,8 +9,6 @@ for the tornado.autoreload module to rerun the tests when code changes. """ -from __future__ import absolute_import, division, print_function - from collections.abc import Generator import functools import inspect diff --git a/tornado/util.py b/tornado/util.py index 01bf4a111..e2802ac1d 100644 --- a/tornado/util.py +++ b/tornado/util.py @@ -10,8 +10,6 @@ interface of its subclasses, including `.AsyncHTTPClient`, `.IOLoop`, and `.Resolver`. """ -from __future__ import absolute_import, division, print_function - import array import atexit from inspect import getfullargspec diff --git a/tornado/web.py b/tornado/web.py index de9bd9480..76337ea83 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -57,8 +57,6 @@ the executor do not refer to Tornado objects. """ -from __future__ import absolute_import, division, print_function - import base64 import binascii import datetime diff --git a/tornado/websocket.py b/tornado/websocket.py index bba00d1ee..5398180aa 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -16,8 +16,6 @@ the protocol (known as "draft 76") and are not compatible with this module. Removed support for the draft 76 protocol version. """ -from __future__ import absolute_import, division, print_function - import base64 import hashlib import os diff --git a/tornado/wsgi.py b/tornado/wsgi.py index 3f31ddb8a..a23be2427 100644 --- a/tornado/wsgi.py +++ b/tornado/wsgi.py @@ -27,8 +27,6 @@ container. """ -from __future__ import absolute_import, division, print_function - import sys from io import BytesIO import tornado