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 2f4a85cde37a6eb91890f6a4bc475c3d8d1155a9..dbc2792d40106ed0c8eea4f3a37dd083ed9caa70 100644 (file)
--- 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 e856a5fe481182ab91163c0e64df0a06e210b0fe..a7edfea5fe69b8b505228b53fd7edf4f2d33de61 100644 (file)
--- 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 e073afe53e81071ad9a9ed3a7206645b0de7bf92..6fa2c29742af692196e9edd5ad953ef95acc462b 100644 (file)
--- 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 44144061e644a69c403712c191dad0e81d420a11..d71d56a668b4388106d6bc3b1d96271ddaf81248 100644 (file)
--- 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 5e0d00d1ffaa2ca797b2e0b4e9ecef1024d71c09..568f0e5e0df35de988d47c264d37226ada2a9295 100644 (file)
--- 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 ec68dc4fe337388bf50c50dcee12e0b26783ea95..02620875601a1d4c87214177df7af98a2fcfafc1 100644 (file)
--- 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 bef78419f0e5fc9471d963e47a3050dde4142c26..ab54bc0b14e55e815c6160ced271b14ad7a63616 100644 (file)
--- 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 7a3b0e03495b927bc667b44f2df3c393fa5b987f..c4b2fa3b480ec864adfa61e73c0a2dc71157ee92 100644 (file)
--- 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 d7df3b52f3cb4686d8e8da951a783f7e223a3963..62bc144b817b9a09faac0f7cf88d5ecb5e33884f 100644 (file)
--- 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 b73acf71df8d883bc43933f3fe7c6ec22c368512..ff9fc962eddcdbdc3c07487bd8dd4ff1cc6070ae 100644 (file)
--- 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 2b5d1fbac9f1fc3df4a221d31fce0a19db72876c..8e1e376465a575b860fa232c57118771f7df87fd 100644 (file)
--- 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 c7b9c2f8bda33635ca2f69b011ea5e42d512da24..70311bf9701d5d5ceb75042441040304efd4afa9 100644 (file)
--- 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 79338b0ebb22232039178a8d0030fe656a771c26..39a27f78c08ad0169f1ce488997f85bd442f4ed2 100644 (file)
--- 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 1b1a07cd5a951ce1f4fcc1448c7a0e0c1a270127..e9621d14737bbf27755fe6b36dd6af4303b1be37 100644 (file)
--- 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 fc419dcffeb374f55f3b13ce27848fe8699f48fc..0746e1d51e9063d7849ee0dd0fc4bf0d1889f635 100644 (file)
--- 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 fed71a7b3e262a0418484a83b0d107a5797516d5..7dba10d616c3a3440b1b14b77290536b99a41fa7 100644 (file)
--- 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 d84a9a870d7485a2b0c6c56a48fa9f27ec90130b..4f9ecf6dfd626fa41e5d12b938344906ab9e43df 100644 (file)
--- 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 ac1bb95ea781e421f4f1c94246686c2a059f06bb..a925f6b8a09d27dffaf4996f1860a109b6f618e4 100644 (file)
--- 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 20b4bdd63f62e6395ff60a36fd9900d96859f5f1..9653421fedde75038b8f5bf3d57148a39ad69488 100644 (file)
--- 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 2fbb32ad02692458b6d267ea5266eed5ad7d31f0..0a72cc65edbd10b3c339c0c5a2844f35ab3cbe26 100644 (file)
--- 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 9556da618d84c0990984700884af7e03058d0711..549a1cc00c0bc405cbc708e55bd2a73132f55606 100644 (file)
--- 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 449b634b9bd53e030da07c97c1407c82dfcb3d91..1f4d7001939cc8b227a5c8c5cbf877eaac622d24 100644 (file)
--- 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 4205de30c22afad08018caf785df3e25e7f227a0..fd6e9d2748c314dbe1494b44d6615f5262c0948f 100644 (file)
--- 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 d78ee6866bf6a2d0fdcff137bddbbfe4d92836fd..f51f49acc88dac05e7761d940dd387e6d728ce40 100644 (file)
--- 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 b08cc62810f0b993583734d392f8296200f49200..80bfd8af4c69a51425f8c34d1c24f0893c30796a 100644 (file)
--- 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 cc062391175fee2e0346a868eecf3b8b0c248066..e4d92736a9b688af7e4c108f8cb77f3bc53471fe 100644 (file)
--- 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 f8f3e4a6113ee0901df45b15ae67a16b3cd2a7e2..3a5d417429d3b958860ae0c1d6616804b7b0efe0 100644 (file)
--- 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 572c013906b701b2d7f504054c866a077b769649..9bf1f18868ca70f8016cc4f6667d71aa961d5bc2 100644 (file)
--- 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 db52ef91063bf813f8ed39f5fe2ef4d803429e72..a18049f7cdab0a56bbc327ce67c52bf13bd637fe 100644 (file)
--- 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 92157c7c045cfd2127fb761eb43ee973c7992373..ec269413b27da463d30876a72e513b6797f95e28 100644 (file)
--- 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 9a319f27715e2fea22d756e302f5f55f5490e23f..e94a0cf13dab716e1a9168e7a0c5e7f4dac4e9ec 100644 (file)
--- 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 5281fa5f53feea5977cf9b504ecc92cac6a9e755..fae94f3c13cf89951b61622c3b12fd976c5e05cf 100644 (file)
--- 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 77eda98b019642c0c40c43199080d0632f6533d7..0041a8008646d5d4fb22decd59011a1ed2f354de 100644 (file)
--- 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 71c63b3db588b39a3b2a47df83ce5f1b95b44fb1..56fb5e7dfe71b83c59f87fd616fb2971cf9ead29 100644 (file)
--- 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 bce476c14e5aa2016ba86e87bff39d1a3b415354..8fb70707f97be0b95880df21ec2052a13584ffe5 100644 (file)
--- 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 2c0d9ee7d6450de14ca29ec4f8cb29807fcd6e99..74e393856cb7f354aa824ff03cfe4b82603945e9 100644 (file)
--- 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 244966ca4a71eebec25e1cb61e3371bc796ebe84..2d6825028f320757b7bab5f61332b295f48d05aa 100644 (file)
--- 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 ac66669869b2eff6f0dffafb23582abfc550d999..f47ec89a4289e81cebf4439342b3b711cad3ca25 100644 (file)
--- 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 67c61e6b5f985cb1ba146ddb82df1256945ea7b4..3b2fa3feef2d95f13055e48c193b81ffdf136abe 100644 (file)
--- 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 5953443b19b20719fc2b74d3798911795c3081c6..c78478cbd3f201a50c3d1cd28781f8044b47de82 100644 (file)
--- 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 6387b11122c4a59b6449529a71fe25f347f8bef9..d0e3f2b020dfdea6bc9d5b5b1c36a7cf9ec8cc96 100644 (file)
--- 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 92616fa30632e005a4f35d80dd3a61cd915530bd..d18b7b971f012b1c13fb8f4a61245add3befc810 100644 (file)
--- 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 4e5118b173900a564ff606685c0b52b54bc4bb45..fd0f4a67fe3516e2a14f1b8cee4dc1be43f7ee64 100644 (file)
--- 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 b115454276234485b05025135c4e8ba043620bde..eb6f89d6673bc56659aa477499f28b539234f528 100644 (file)
--- 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 b3562cd92872ed8281b956e0ac169083ddabf18a..5ae75d002ab142efdb07bfc07ccad7ea4d3368d5 100644 (file)
--- 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 8bbfc5fa8f2ff16cc633306557bae35fb7252e51..73ccd4e9daae0eabd79d138b27cc97867bc016c2 100644 (file)
--- 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 45321ccecf4e380303dc0e535907ac897da6989c..283c13f413f87d1d5b0113291f0e4ae12fd131a6 100644 (file)
--- 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 815051b91d3660b7d5ba9a62a4ce89e597fa8b92..8aaaaf35b7374e39cdb4c49c402f67d0d44d50d3 100644 (file)
--- 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 8c9a99d9f5a3ea852ee8dafd27c45b153c291028..320454e41afb6991e5a569bde784649e5c3982c4 100644 (file)
--- 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 4016aeb50e46300b881cb0b061eec32f37b2c03c..2e40d279c999181127fe541c794fb57ccb3ea15d 100644 (file)
--- 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 72f4c48bb9bb123b67ed5c7a6bef92fae2815fa1..5249eadde51a78da876a4474d7acec24a123d2dd 100644 (file)
--- 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 a05b452c02c99e84192b73725902a746b5868571..88d02e027039dfcbe32813dbf7e9e2fcb3614a11 100644 (file)
--- 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 1bb8ce081782611db29479cc7f572a9e92e38e61..1601813f44c5285fc66af16aeb05b440cbc6d935 100644 (file)
--- 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 9680cb1c65c1c58ddfd826be7a6055766071e24f..f62b0f85f3dc86216b97a09c7f88c9d06d3495ae 100644 (file)
--- 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 e57a66e686f217de94788b3009d46370a3873f77..d548ffb861b2978319b5b476b1a701da5a35fc37 100644 (file)
--- 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 020ec105e0dd835ff6a9385f4c4b86a25fd3a2c7..844d4fb0ff42921cd2b41d737c502bd373a1ab14 100644 (file)
--- 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 da78fc027d2fdc3ba1d56a5135d1eeab09f861fe..888964e7b018c1e617a787a75b73d49b432518f5 100644 (file)
--- 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 549c4fe1c69edbbc642e9369db3a382629337833..9564290abd2300ae4a85c97380d944add70b0d5f 100644 (file)
--- 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 c050cb6486e8260c0924fcef0bac3fef076b2a63..bafeea6fd35f4897a094dc6df0e7a1b58a8f519a 100644 (file)
--- 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 d071ba5e7cbc6ec0054dcda641c1c02b0cf0e78d..89e742e36fab2a61c04092dc5f20d261d9a52b4c 100644 (file)
--- 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 e72b6ed5f8dce12f198f999ccde82347b0e02977..48ed5e20617462ee76e0ed5c940757cf5a34faaa 100644 (file)
--- 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 070222f0dfc58cc5271e86f946f26541dcefa1ac..429671962f27c07721be163d614161340a773b79 100644 (file)
--- 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 e97786e7388343ff00625251ac66838eb19728fc..a1040df32b1572a9a8e9ca013ab16279941e160f 100644 (file)
--- 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 246d811cc8087d7433ca3c19dbb5c30be0904b64..81ae9a27db512040bb9f6be342f6ddd1f807749c 100644 (file)
--- 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 861602b86712b7ca0d6d8ceceb87a24c9807b1eb..02d57c5fb0d944409149ca7088bcc0061cd27a3b 100644 (file)
--- 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 853260e30ebcd7c92664e172b4716a64ec4f1120..d55e0ee35257618b01fb3fd2bf2693994c8d277c 100644 (file)
--- 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 702e0308bfed87d1868561a93c749ba10e84243e..f36d9a0a5edf70922e8e12800a8afca4f9e7e2bd 100644 (file)
--- 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 2d20b796cbc5ab609a195ceef7a1faa0d92c0b58..18473a55e947c3e1ba8614a29fab8b0ecf5318f9 100644 (file)
--- 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 176d41a7cda611081fada2a596e4375e37a12123..2f1e88c1d15f8dbc2fe88bfc56ceaf481e444cee 100644 (file)
--- 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 e00058ac343128afc1fe5e26d9c5e45d841c97df..b3d6d8c5bb7db45930ef88fdefe67f1765c1bac8 100644 (file)
--- 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 298da6c9cf7a5e879761d7d4e5b2b6b8a7952466..1604ce52f46b0b8defffe77d470db275bd52a870 100644 (file)
--- 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 429bc02404c44daf7a7f13af4ec1c7fc92e0261d..6c032da63f85b28a7298ddb8015b8c2e851a1d8b 100644 (file)
--- 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 cbb89322edddc7622d28b394e3c4ec90fe1fb4ed..459cb9c327164f20ad7e8b81436fc7b984aefe32 100644 (file)
--- 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 ff722c6530c63e2b94774ae173a84e3ae5f45fd8..913818f99a6a9e2b514c8565d75d257840b354dc 100644 (file)
--- 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 48390e6c3bab3e0a7887fb78e4561886a5183801..2de221134d022432dd8e51068a31e2ca6ce37221 100644 (file)
--- 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 26e01614dc3611522514ea7c99513df75758b8e9..f136c8aab0160de1ab2f9a7b7f13ca802a85b211 100644 (file)
--- 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 5b19aad7edcbeeac12f1a3735b35b8d0d0956940..78da7853fee49afeed773567979d2b39444a70a3 100644 (file)
--- 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 1509f608f885082074c5fc4e513e1c60af148329..eff2684d2c1bccace94120928cb76933f719a046 100644 (file)
--- 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 d0f83d1ff9be434d7c12cb72c105431354e46d5b..9335004c3b11b44209e7d61e24389c0e8cb74f3b 100644 (file)
--- 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 4e932b6e773fe03ede1af168e58ce46fc03c9628..a04cc3a60a1909119a8de6ceefa1a16b85ab2d9d 100644 (file)
--- 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 754fca5cdc1540141e6578b51fb0d7afe056c7e5..18320e60a1101357c782a196811b47056d8275f9 100644 (file)
--- 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 e9ead300da036fbb3156feb7df69e26b2cd41e86..68a7615a0ef930a83d47f6a0bc024cd4ee36ed91 100644 (file)
--- 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