From: Andrew Sumin Date: Tue, 7 Mar 2017 09:07:06 +0000 (+0300) Subject: remove redundant with_statement feature X-Git-Tag: v4.5.0~25^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c162ebbc4d3c372cc71c5c7aa97f645795aef704;p=thirdparty%2Ftornado.git remove redundant with_statement feature --- diff --git a/maint/scripts/custom_fixers/fix_future_imports.py b/maint/scripts/custom_fixers/fix_future_imports.py index 2f4a85cde..dbc2792d4 100644 --- a/maint/scripts/custom_fixers/fix_future_imports.py +++ b/maint/scripts/custom_fixers/fix_future_imports.py @@ -22,8 +22,7 @@ class FixFutureImports(fixer_base.BaseFix): new = FromImport("__future__", [Name("absolute_import", prefix=" "), Comma(), Name("division", prefix=" "), Comma(), - Name("print_function", prefix=" "), Comma(), - Name("with_statement", prefix=" ")]) + Name("print_function", prefix=" ")]) if old is not None: new.prefix = old.prefix return new diff --git a/tornado/__init__.py b/tornado/__init__.py index e856a5fe4..a7edfea5f 100644 --- a/tornado/__init__.py +++ b/tornado/__init__.py @@ -16,7 +16,7 @@ """The Tornado web server and tools.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function # version is a human-readable version number. diff --git a/tornado/_locale_data.py b/tornado/_locale_data.py index e073afe53..6fa2c2974 100644 --- a/tornado/_locale_data.py +++ b/tornado/_locale_data.py @@ -17,7 +17,7 @@ """Data used by the tornado.locale module.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function LOCALE_NAMES = { "af_ZA": {"name_en": u"Afrikaans", "name": u"Afrikaans"}, diff --git a/tornado/auth.py b/tornado/auth.py index 44144061e..d71d56a66 100644 --- a/tornado/auth.py +++ b/tornado/auth.py @@ -65,7 +65,7 @@ Example usage for Google OAuth: errors are more consistently reported through the ``Future`` interfaces. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import base64 import binascii diff --git a/tornado/autoreload.py b/tornado/autoreload.py index 5e0d00d1f..568f0e5e0 100644 --- a/tornado/autoreload.py +++ b/tornado/autoreload.py @@ -45,7 +45,7 @@ incorrectly. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import os import sys diff --git a/tornado/concurrent.py b/tornado/concurrent.py index ec68dc4fe..026208756 100644 --- a/tornado/concurrent.py +++ b/tornado/concurrent.py @@ -21,7 +21,7 @@ a mostly-compatible `Future` class designed for use from coroutines, as well as some utility functions for interacting with the `concurrent.futures` package. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import functools import platform diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py index bef78419f..ab54bc0b1 100644 --- a/tornado/curl_httpclient.py +++ b/tornado/curl_httpclient.py @@ -16,7 +16,7 @@ """Non-blocking HTTP client implementation using pycurl.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections import functools diff --git a/tornado/escape.py b/tornado/escape.py index 7a3b0e034..c4b2fa3b4 100644 --- a/tornado/escape.py +++ b/tornado/escape.py @@ -20,7 +20,7 @@ Also includes a few other miscellaneous string manipulation functions that have crept in over time. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import json import re diff --git a/tornado/gen.py b/tornado/gen.py index d7df3b52f..62bc144b8 100644 --- a/tornado/gen.py +++ b/tornado/gen.py @@ -74,7 +74,7 @@ See the `convert_yielded` function to extend this mechanism. via ``singledispatch``. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections import functools diff --git a/tornado/http1connection.py b/tornado/http1connection.py index b73acf71d..ff9fc962e 100644 --- a/tornado/http1connection.py +++ b/tornado/http1connection.py @@ -19,7 +19,7 @@ .. versionadded:: 4.0 """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import re diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 2b5d1fbac..8e1e37646 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -38,7 +38,7 @@ To select ``curl_httpclient``, call `AsyncHTTPClient.configure` at startup:: AsyncHTTPClient.configure("tornado.curl_httpclient.CurlAsyncHTTPClient") """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import functools import time diff --git a/tornado/httpserver.py b/tornado/httpserver.py index c7b9c2f8b..70311bf97 100644 --- a/tornado/httpserver.py +++ b/tornado/httpserver.py @@ -26,7 +26,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import socket diff --git a/tornado/httputil.py b/tornado/httputil.py index 79338b0eb..39a27f78c 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -20,7 +20,7 @@ This module also defines the `HTTPServerRequest` class which is exposed via `tornado.web.RequestHandler.request`. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import calendar import collections diff --git a/tornado/ioloop.py b/tornado/ioloop.py index 1b1a07cd5..e9621d147 100644 --- a/tornado/ioloop.py +++ b/tornado/ioloop.py @@ -26,7 +26,7 @@ In addition to I/O events, the `IOLoop` can also schedule time-based events. `IOLoop.add_timeout` is a non-blocking alternative to `time.sleep`. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections import datetime diff --git a/tornado/iostream.py b/tornado/iostream.py index fc419dcff..0746e1d51 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -24,7 +24,7 @@ Contents: * `PipeIOStream`: Pipe-based IOStream implementation. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections import errno diff --git a/tornado/locale.py b/tornado/locale.py index fed71a7b3..7dba10d61 100644 --- a/tornado/locale.py +++ b/tornado/locale.py @@ -39,7 +39,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import codecs import csv diff --git a/tornado/locks.py b/tornado/locks.py index d84a9a870..4f9ecf6df 100644 --- a/tornado/locks.py +++ b/tornado/locks.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections diff --git a/tornado/log.py b/tornado/log.py index ac1bb95ea..a925f6b8a 100644 --- a/tornado/log.py +++ b/tornado/log.py @@ -28,7 +28,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import logging import logging.handlers diff --git a/tornado/netutil.py b/tornado/netutil.py index 20b4bdd63..9653421fe 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -16,7 +16,7 @@ """Miscellaneous network utility code.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import errno import os diff --git a/tornado/options.py b/tornado/options.py index 2fbb32ad0..0a72cc65e 100644 --- a/tornado/options.py +++ b/tornado/options.py @@ -82,7 +82,7 @@ instances to define isolated sets of options, such as for subcommands. underscores. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import datetime import numbers diff --git a/tornado/platform/asyncio.py b/tornado/platform/asyncio.py index 9556da618..549a1cc00 100644 --- a/tornado/platform/asyncio.py +++ b/tornado/platform/asyncio.py @@ -19,7 +19,7 @@ loops. Windows. Use the `~asyncio.SelectorEventLoop` instead. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import functools import tornado.concurrent diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py index 449b634b9..1f4d70019 100644 --- a/tornado/platform/auto.py +++ b/tornado/platform/auto.py @@ -23,7 +23,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import os diff --git a/tornado/platform/caresresolver.py b/tornado/platform/caresresolver.py index 4205de30c..fd6e9d274 100644 --- a/tornado/platform/caresresolver.py +++ b/tornado/platform/caresresolver.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import pycares # type: ignore import socket diff --git a/tornado/platform/common.py b/tornado/platform/common.py index d78ee6866..f51f49acc 100644 --- a/tornado/platform/common.py +++ b/tornado/platform/common.py @@ -1,5 +1,5 @@ """Lowest-common-denominator implementations of platform functionality.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import errno import socket diff --git a/tornado/platform/epoll.py b/tornado/platform/epoll.py index b08cc6281..80bfd8af4 100644 --- a/tornado/platform/epoll.py +++ b/tornado/platform/epoll.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. """EPoll-based IOLoop implementation for Linux systems.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import select diff --git a/tornado/platform/interface.py b/tornado/platform/interface.py index cc0623911..e4d92736a 100644 --- a/tornado/platform/interface.py +++ b/tornado/platform/interface.py @@ -21,7 +21,7 @@ for other tornado.platform modules. Most code should import the appropriate implementation from `tornado.platform.auto`. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function def set_close_exec(fd): diff --git a/tornado/platform/kqueue.py b/tornado/platform/kqueue.py index f8f3e4a61..3a5d41742 100644 --- a/tornado/platform/kqueue.py +++ b/tornado/platform/kqueue.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. """KQueue-based IOLoop implementation for BSD/Mac systems.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import select diff --git a/tornado/platform/posix.py b/tornado/platform/posix.py index 572c01390..9bf1f1886 100644 --- a/tornado/platform/posix.py +++ b/tornado/platform/posix.py @@ -16,7 +16,7 @@ """Posix implementations of platform-specific functionality.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import fcntl import os diff --git a/tornado/platform/select.py b/tornado/platform/select.py index db52ef910..a18049f7c 100644 --- a/tornado/platform/select.py +++ b/tornado/platform/select.py @@ -17,7 +17,7 @@ Used as a fallback for systems that don't support epoll or kqueue. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import select diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py index 92157c7c0..ec269413b 100644 --- a/tornado/platform/twisted.py +++ b/tornado/platform/twisted.py @@ -21,7 +21,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import datetime import functools diff --git a/tornado/platform/windows.py b/tornado/platform/windows.py index 9a319f277..e94a0cf13 100644 --- a/tornado/platform/windows.py +++ b/tornado/platform/windows.py @@ -2,7 +2,7 @@ # for production use. -from __future__ import absolute_import, division, print_function, with_statement +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 5281fa5f5..fae94f3c1 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -18,7 +18,7 @@ the server into multiple processes and managing subprocesses. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import errno import os diff --git a/tornado/queues.py b/tornado/queues.py index 77eda98b0..0041a8008 100644 --- a/tornado/queues.py +++ b/tornado/queues.py @@ -22,7 +22,7 @@ before calling any queue methods. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections import heapq diff --git a/tornado/routing.py b/tornado/routing.py index 71c63b3db..56fb5e7df 100644 --- a/tornado/routing.py +++ b/tornado/routing.py @@ -161,7 +161,7 @@ In the example below `RuleRouter` is used to route between applications: For more information on application-level routing see docs for `~.web.Application`. """ -from __future__ import absolute_import, division, print_function, with_statement +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 bce476c14..8fb70707f 100644 --- a/tornado/simple_httpclient.py +++ b/tornado/simple_httpclient.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado.escape import utf8, _unicode from tornado import gen diff --git a/tornado/stack_context.py b/tornado/stack_context.py index 2c0d9ee7d..74e393856 100644 --- a/tornado/stack_context.py +++ b/tornado/stack_context.py @@ -67,7 +67,7 @@ Here are a few rules of thumb for when it's necessary: block that references your `StackContext`. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import sys import threading diff --git a/tornado/tcpclient.py b/tornado/tcpclient.py index 244966ca4..2d6825028 100644 --- a/tornado/tcpclient.py +++ b/tornado/tcpclient.py @@ -16,7 +16,7 @@ """A non-blocking TCP connection factory. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import functools import socket diff --git a/tornado/tcpserver.py b/tornado/tcpserver.py index ac6666986..f47ec89a4 100644 --- a/tornado/tcpserver.py +++ b/tornado/tcpserver.py @@ -15,7 +15,7 @@ # under the License. """A non-blocking, single-threaded TCP server.""" -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import errno import os diff --git a/tornado/template.py b/tornado/template.py index 67c61e6b5..3b2fa3fee 100644 --- a/tornado/template.py +++ b/tornado/template.py @@ -196,7 +196,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function import datetime import linecache diff --git a/tornado/test/__main__.py b/tornado/test/__main__.py index 5953443b1..c78478cbd 100644 --- a/tornado/test/__main__.py +++ b/tornado/test/__main__.py @@ -2,7 +2,7 @@ This only works in python 2.7+. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado.test.runtests import all, main diff --git a/tornado/test/asyncio_test.py b/tornado/test/asyncio_test.py index 6387b1112..d0e3f2b02 100644 --- a/tornado/test/asyncio_test.py +++ b/tornado/test/asyncio_test.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado import gen from tornado.testing import AsyncTestCase, gen_test diff --git a/tornado/test/auth_test.py b/tornado/test/auth_test.py index 92616fa30..d18b7b971 100644 --- a/tornado/test/auth_test.py +++ b/tornado/test/auth_test.py @@ -4,7 +4,7 @@ # python 3) -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado.auth import OpenIdMixin, OAuthMixin, OAuth2Mixin, TwitterMixin, AuthError, GoogleOAuth2Mixin, FacebookGraphMixin from tornado.concurrent import Future from tornado.escape import json_decode diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py index 4e5118b17..fd0f4a67f 100644 --- a/tornado/test/concurrent_test.py +++ b/tornado/test/concurrent_test.py @@ -13,7 +13,7 @@ # 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, with_statement +from __future__ import absolute_import, division, print_function import gc import logging diff --git a/tornado/test/curl_httpclient_test.py b/tornado/test/curl_httpclient_test.py index b11545427..eb6f89d66 100644 --- a/tornado/test/curl_httpclient_test.py +++ b/tornado/test/curl_httpclient_test.py @@ -1,5 +1,5 @@ # coding: utf-8 -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from hashlib import md5 diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py index b3562cd92..5ae75d002 100644 --- a/tornado/test/escape_test.py +++ b/tornado/test/escape_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function 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 diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py index 8bbfc5fa8..73ccd4e9d 100644 --- a/tornado/test/gen_test.py +++ b/tornado/test/gen_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import gc import contextlib diff --git a/tornado/test/gettext_translations/extract_me.py b/tornado/test/gettext_translations/extract_me.py index 45321ccec..283c13f41 100644 --- a/tornado/test/gettext_translations/extract_me.py +++ b/tornado/test/gettext_translations/extract_me.py @@ -8,7 +8,7 @@ # 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, with_statement +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 815051b91..8aaaaf35b 100644 --- a/tornado/test/http1connection_test.py +++ b/tornado/test/http1connection_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import socket diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py index 8c9a99d9f..320454e41 100644 --- a/tornado/test/httpclient_test.py +++ b/tornado/test/httpclient_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import base64 import binascii diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py index 4016aeb50..2e40d279c 100644 --- a/tornado/test/httpserver_test.py +++ b/tornado/test/httpserver_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado import netutil from tornado.escape import json_decode, json_encode, utf8, _unicode, recursive_unicode, native_str from tornado import gen diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py index 72f4c48bb..5249eadde 100644 --- a/tornado/test/httputil_test.py +++ b/tornado/test/httputil_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function, with_statement +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 from tornado.escape import utf8, native_str from tornado.log import gen_log diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py index a05b452c0..88d02e027 100644 --- a/tornado/test/import_test.py +++ b/tornado/test/import_test.py @@ -1,5 +1,5 @@ # flake8: noqa -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado.test.util import unittest diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index 1bb8ce081..1601813f4 100644 --- a/tornado/test/ioloop_test.py +++ b/tornado/test/ioloop_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import contextlib import datetime import functools diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py index 9680cb1c6..f62b0f85f 100644 --- a/tornado/test/iostream_test.py +++ b/tornado/test/iostream_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +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 e57a66e68..d548ffb86 100644 --- a/tornado/test/locale_test.py +++ b/tornado/test/locale_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import datetime import os diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py index 020ec105e..844d4fb0f 100644 --- a/tornado/test/locks_test.py +++ b/tornado/test/locks_test.py @@ -11,7 +11,7 @@ # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from datetime import timedelta from tornado import gen, locks diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py index da78fc027..888964e7b 100644 --- a/tornado/test/log_test.py +++ b/tornado/test/log_test.py @@ -13,7 +13,7 @@ # 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, with_statement +from __future__ import absolute_import, division, print_function import contextlib import glob diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py index 549c4fe1c..9564290ab 100644 --- a/tornado/test/netutil_test.py +++ b/tornado/test/netutil_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import errno import os diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py index c050cb648..bafeea6fd 100644 --- a/tornado/test/options_test.py +++ b/tornado/test/options_test.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import datetime import os diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index d071ba5e7..89e742e36 100644 --- a/tornado/test/process_test.py +++ b/tornado/test/process_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import logging import os import signal diff --git a/tornado/test/queues_test.py b/tornado/test/queues_test.py index e72b6ed5f..48ed5e206 100644 --- a/tornado/test/queues_test.py +++ b/tornado/test/queues_test.py @@ -11,7 +11,7 @@ # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from datetime import timedelta from random import random diff --git a/tornado/test/resolve_test_helper.py b/tornado/test/resolve_test_helper.py index 070222f0d..429671962 100644 --- a/tornado/test/resolve_test_helper.py +++ b/tornado/test/resolve_test_helper.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +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 e97786e73..a1040df32 100644 --- a/tornado/test/routing_test.py +++ b/tornado/test/routing_test.py @@ -11,7 +11,7 @@ # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado.httputil import HTTPHeaders, HTTPMessageDelegate, HTTPServerConnectionDelegate, ResponseStartLine from tornado.routing import HostMatches, PathMatches, ReversibleRouter, Router, Rule, RuleRouter diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py index 246d811cc..81ae9a27d 100644 --- a/tornado/test/runtests.py +++ b/tornado/test/runtests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import gc import locale # system locale module, not tornado.locale import logging diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index 861602b86..02d57c5fb 100644 --- a/tornado/test/simple_httpclient_test.py +++ b/tornado/test/simple_httpclient_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import collections from contextlib import closing diff --git a/tornado/test/stack_context_test.py b/tornado/test/stack_context_test.py index 853260e30..d55e0ee35 100644 --- a/tornado/test/stack_context_test.py +++ b/tornado/test/stack_context_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado import gen from tornado.log import app_log diff --git a/tornado/test/tcpclient_test.py b/tornado/test/tcpclient_test.py index 702e0308b..f36d9a0a5 100644 --- a/tornado/test/tcpclient_test.py +++ b/tornado/test/tcpclient_test.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from contextlib import closing import os diff --git a/tornado/test/tcpserver_test.py b/tornado/test/tcpserver_test.py index 2d20b796c..18473a55e 100644 --- a/tornado/test/tcpserver_test.py +++ b/tornado/test/tcpserver_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import socket diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py index 176d41a7c..2f1e88c1d 100644 --- a/tornado/test/template_test.py +++ b/tornado/test/template_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import os import sys diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py index e00058ac3..b3d6d8c5b 100644 --- a/tornado/test/testing_test.py +++ b/tornado/test/testing_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from tornado import gen, ioloop from tornado.log import app_log diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py index 298da6c9c..1604ce52f 100644 --- a/tornado/test/twisted_test.py +++ b/tornado/test/twisted_test.py @@ -17,7 +17,7 @@ Unittest for the twisted-style reactor. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import logging import os diff --git a/tornado/test/util.py b/tornado/test/util.py index 429bc0240..6c032da63 100644 --- a/tornado/test/util.py +++ b/tornado/test/util.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import os import platform diff --git a/tornado/test/util_test.py b/tornado/test/util_test.py index cbb89322e..459cb9c32 100644 --- a/tornado/test/util_test.py +++ b/tornado/test/util_test.py @@ -1,5 +1,5 @@ # coding: utf-8 -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import re import sys import datetime diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index ff722c653..913818f99 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +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 diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py index 48390e6c3..2de221134 100644 --- a/tornado/test/websocket_test.py +++ b/tornado/test/websocket_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import sys import traceback diff --git a/tornado/test/windows_test.py b/tornado/test/windows_test.py index 26e01614d..f136c8aab 100644 --- a/tornado/test/windows_test.py +++ b/tornado/test/windows_test.py @@ -1,3 +1,4 @@ +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 5b19aad7e..78da7853f 100644 --- a/tornado/test/wsgi_test.py +++ b/tornado/test/wsgi_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function from wsgiref.validate import validator from tornado.escape import json_decode diff --git a/tornado/testing.py b/tornado/testing.py index 1509f608f..eff2684d2 100644 --- a/tornado/testing.py +++ b/tornado/testing.py @@ -10,7 +10,7 @@ for the tornado.autoreload module to rerun the tests when code changes. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function try: from tornado import gen diff --git a/tornado/util.py b/tornado/util.py index d0f83d1ff..9335004c3 100644 --- a/tornado/util.py +++ b/tornado/util.py @@ -10,7 +10,7 @@ interface of its subclasses, including `.AsyncHTTPClient`, `.IOLoop`, and `.Resolver`. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import array import atexit diff --git a/tornado/web.py b/tornado/web.py index 4e932b6e7..a04cc3a60 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -56,7 +56,7 @@ request. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import base64 import binascii diff --git a/tornado/websocket.py b/tornado/websocket.py index 754fca5cd..18320e60a 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -16,7 +16,7 @@ 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, with_statement +from __future__ import absolute_import, division, print_function # Author: Jacob Kristhammar, 2010 import base64 diff --git a/tornado/wsgi.py b/tornado/wsgi.py index e9ead300d..68a7615a0 100644 --- a/tornado/wsgi.py +++ b/tornado/wsgi.py @@ -29,7 +29,7 @@ provides WSGI support in two ways: and Tornado handlers in a single server. """ -from __future__ import absolute_import, division, print_function, with_statement +from __future__ import absolute_import, division, print_function import sys from io import BytesIO