From: Ben Darnell Date: Mon, 14 Jan 2013 00:35:04 +0000 (-0500) Subject: Convert print to a function and add future imports. X-Git-Tag: v3.0.0~181 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65df55da409acd8ec68d95a17d8bedf96d1f2e0f;p=thirdparty%2Ftornado.git Convert print to a function and add future imports. Automated with 2to3 and custom fixer. 2to3 -f print tornado > print.diff 2to3 -f print -d tornado > print_doctest.diff maint/scripts/run_fixers.py -f future_import tornado > future.diff cd tornado git apply ../{print,print_doctest,future}.diff --- diff --git a/maint/scripts/custom_fixers/fix_future_imports.py b/maint/scripts/custom_fixers/fix_future_imports.py index 3037abfed..2f4a85cde 100644 --- a/maint/scripts/custom_fixers/fix_future_imports.py +++ b/maint/scripts/custom_fixers/fix_future_imports.py @@ -22,11 +22,12 @@ 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=" ")]) if old is not None: new.prefix = old.prefix return new - + def transform(self, node, results): self.found_future_import = True return self.new_future_import(node) @@ -56,5 +57,3 @@ class FixFutureImports(fixer_base.BaseFix): pos = 0 tree.insert_child(pos, self.new_future_import(None)) tree.insert_child(pos+1, Newline()) # terminates the import stmt - - diff --git a/tornado/__init__.py b/tornado/__init__.py index 2d1bba883..b8c645f12 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement # version is a human-readable version number. diff --git a/tornado/auth.py b/tornado/auth.py index c472f9339..fd4728537 100644 --- a/tornado/auth.py +++ b/tornado/auth.py @@ -44,7 +44,7 @@ Example usage for Google OpenID:: # Save the user with, e.g., set_secure_cookie() """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import base64 import binascii diff --git a/tornado/autoreload.py b/tornado/autoreload.py index e7c5d481a..7aa153c18 100644 --- a/tornado/autoreload.py +++ b/tornado/autoreload.py @@ -31,7 +31,7 @@ Additionally, modifying these variables will cause reloading to behave incorrectly. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import sys @@ -263,7 +263,7 @@ def main(): script = sys.argv[1] sys.argv = sys.argv[1:] else: - print >>sys.stderr, _USAGE + print(_USAGE, file=sys.stderr) sys.exit(1) try: diff --git a/tornado/concurrent.py b/tornado/concurrent.py index c1a9593c2..14786b03b 100644 --- a/tornado/concurrent.py +++ b/tornado/concurrent.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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import functools import sys diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py index ebf54ae9f..a576d7278 100644 --- a/tornado/curl_httpclient.py +++ b/tornado/curl_httpclient.py @@ -16,7 +16,7 @@ """Blocking and non-blocking HTTP client implementations using pycurl.""" -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import cStringIO import collections diff --git a/tornado/escape.py b/tornado/escape.py index 6833f9f16..ecf97a1df 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import htmlentitydefs import re diff --git a/tornado/gen.py b/tornado/gen.py index 88ded2eff..2513a836f 100644 --- a/tornado/gen.py +++ b/tornado/gen.py @@ -62,7 +62,7 @@ it was called with one argument, the result is that argument. If it was called with more than one argument or any keyword arguments, the result is an `Arguments` object, which is a named tuple ``(args, kwargs)``. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import functools import operator diff --git a/tornado/httpclient.py b/tornado/httpclient.py index dadb4d440..ec75515a6 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -29,7 +29,7 @@ you use a recent version of ``libcurl`` and ``pycurl``. Currently the minimum supported version is 7.18.2, and the recommended version is 7.21.1 or newer. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import calendar import email.utils @@ -446,9 +446,9 @@ def main(): else: raise if options.print_headers: - print response.headers + print(response.headers) if options.print_body: - print response.body + print(response.body) client.close() if __name__ == "__main__": diff --git a/tornado/httpserver.py b/tornado/httpserver.py index 47120ca59..003f18409 100644 --- a/tornado/httpserver.py +++ b/tornado/httpserver.py @@ -24,7 +24,7 @@ This module also defines the `HTTPRequest` class which is exposed via `tornado.web.RequestHandler.request`. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import Cookie import socket diff --git a/tornado/httputil.py b/tornado/httputil.py index a7d543cc2..30cefbb2c 100644 --- a/tornado/httputil.py +++ b/tornado/httputil.py @@ -16,7 +16,7 @@ """HTTP utility code shared by clients and servers.""" -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import urllib import re @@ -47,8 +47,8 @@ class HTTPHeaders(dict): ['A=B', 'C=D'] >>> for (k,v) in sorted(h.get_all()): - ... print '%s: %s' % (k,v) - ... + ... print('%s: %s' % (k,v)) + ... Content-Type: text/html Set-Cookie: A=B Set-Cookie: C=D diff --git a/tornado/ioloop.py b/tornado/ioloop.py index ef44decc6..9027ace46 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import datetime import errno diff --git a/tornado/iostream.py b/tornado/iostream.py index f090bc6dd..9bc1269f5 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import collections import errno @@ -874,17 +874,17 @@ def _merge_prefix(deque, size): string of up to size bytes. >>> d = collections.deque(['abc', 'de', 'fghi', 'j']) - >>> _merge_prefix(d, 5); print d + >>> _merge_prefix(d, 5); print(d) deque(['abcde', 'fghi', 'j']) Strings will be split as necessary to reach the desired size. - >>> _merge_prefix(d, 7); print d + >>> _merge_prefix(d, 7); print(d) deque(['abcdefg', 'hi', 'j']) - >>> _merge_prefix(d, 3); print d + >>> _merge_prefix(d, 3); print(d) deque(['abc', 'defg', 'hi', 'j']) - >>> _merge_prefix(d, 100); print d + >>> _merge_prefix(d, 100); print(d) deque(['abcdefghij']) """ if len(deque) == 1 and len(deque[0]) <= size: diff --git a/tornado/locale.py b/tornado/locale.py index e44875b30..b4abd5fe9 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import csv import datetime diff --git a/tornado/log.py b/tornado/log.py index f7b74fe95..495fba91f 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import logging import logging.handlers diff --git a/tornado/netutil.py b/tornado/netutil.py index 0375cab3a..8137945de 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -16,7 +16,7 @@ """Miscellaneous network utility code.""" -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import errno import os diff --git a/tornado/options.py b/tornado/options.py index ac1f07c19..64083a929 100644 --- a/tornado/options.py +++ b/tornado/options.py @@ -57,7 +57,7 @@ simply call methods on it. You may create additional `OptionParser` instances to define isolated sets of options, such as for subcommands. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import datetime import re @@ -218,15 +218,15 @@ class OptionParser(object): """Prints all the command line options to stderr (or another file).""" if file is None: file = sys.stderr - print >> file, "Usage: %s [OPTIONS]" % sys.argv[0] - print >> file, "\nOptions:\n" + print("Usage: %s [OPTIONS]" % sys.argv[0], file=file) + print("\nOptions:\n", file=file) by_group = {} for option in self._options.itervalues(): by_group.setdefault(option.group_name, []).append(option) for filename, o in sorted(by_group.items()): if filename: - print >> file, "\n%s options:\n" % os.path.normpath(filename) + print("\n%s options:\n" % os.path.normpath(filename), file=file) o.sort(key=lambda option: option.name) for option in o: prefix = option.name @@ -238,10 +238,10 @@ class OptionParser(object): lines = textwrap.wrap(description, 79 - 35) if len(prefix) > 30 or len(lines) == 0: lines.insert(0, '') - print >> file, " --%-30s %s" % (prefix, lines[0]) + print(" --%-30s %s" % (prefix, lines[0]), file=file) for line in lines[1:]: - print >> file, "%-34s %s" % (' ', line) - print >> file + print("%-34s %s" % (' ', line), file=file) + print(file=file) def _help_callback(self, value): if value: diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py index 7199cb5ce..e55725b37 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os diff --git a/tornado/platform/common.py b/tornado/platform/common.py index a01f3789e..011a810d1 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import errno import socket diff --git a/tornado/platform/epoll.py b/tornado/platform/epoll.py index fa5b68eda..cc8c0c6f5 100644 --- a/tornado/platform/epoll.py +++ b/tornado/platform/epoll.py @@ -18,7 +18,7 @@ Supports the standard library's `select.epoll` function for Python 2.6+, and our own C module for Python 2.5. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import select diff --git a/tornado/platform/interface.py b/tornado/platform/interface.py index 5006f30b8..07da6babd 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement def set_close_exec(fd): diff --git a/tornado/platform/kqueue.py b/tornado/platform/kqueue.py index 2f14c15c3..a9c189813 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import select diff --git a/tornado/platform/posix.py b/tornado/platform/posix.py index 487f97a9a..deed7b9a6 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import fcntl import os diff --git a/tornado/platform/select.py b/tornado/platform/select.py index 51dc964e0..f28694c67 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import select diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py index 1efc82b70..07db8085c 100644 --- a/tornado/platform/twisted.py +++ b/tornado/platform/twisted.py @@ -64,7 +64,7 @@ reactor. Recommended usage:: This module has been tested with Twisted versions 11.0.0 and newer. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import functools import datetime diff --git a/tornado/platform/windows.py b/tornado/platform/windows.py index 80c8a6e28..817bdca13 100644 --- a/tornado/platform/windows.py +++ b/tornado/platform/windows.py @@ -2,7 +2,7 @@ # for production use. -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import ctypes import ctypes.wintypes diff --git a/tornado/process.py b/tornado/process.py index f8f532ce4..229a0d879 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -16,7 +16,7 @@ """Utilities for working with multiple processes.""" -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import errno import functools diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py index 7000d987e..a289d3966 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.escape import utf8, _unicode, native_str from tornado.httpclient import HTTPRequest, HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy diff --git a/tornado/stack_context.py b/tornado/stack_context.py index d4aec3c5e..832fe99f5 100644 --- a/tornado/stack_context.py +++ b/tornado/stack_context.py @@ -66,7 +66,7 @@ Here are a few rules of thumb for when it's necessary: block that references your `StackContext`. ''' -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import contextlib import functools diff --git a/tornado/template.py b/tornado/template.py index 0cd8124e8..2a31f3f21 100644 --- a/tornado/template.py +++ b/tornado/template.py @@ -179,7 +179,7 @@ with ``{# ... #}``. ``{% continue %}`` may be used inside the loop. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import cStringIO import datetime @@ -620,7 +620,7 @@ class _CodeWriter(object): ancestors = ["%s:%d" % (tmpl.name, lineno) for (tmpl, lineno) in self.include_stack] line_comment += ' (via %s)' % ', '.join(reversed(ancestors)) - print >> self.file, " " * indent + line + line_comment + print(" " * indent + line + line_comment, file=self.file) class _TemplateReader(object): diff --git a/tornado/test/auth_test.py b/tornado/test/auth_test.py index d486b4ed1..138684d46 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.auth import OpenIdMixin, OAuthMixin, OAuth2Mixin, TwitterMixin from tornado.escape import json_decode from tornado.testing import AsyncHTTPTestCase diff --git a/tornado/test/concurrent_test.py b/tornado/test/concurrent_test.py index a33f4a580..e0899bb67 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import logging import re diff --git a/tornado/test/curl_httpclient_test.py b/tornado/test/curl_httpclient_test.py index 86ec3a8b5..95e1b037d 100644 --- a/tornado/test/curl_httpclient_test.py +++ b/tornado/test/curl_httpclient_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.httpclient import HTTPRequest from tornado.stack_context import ExceptionStackContext from tornado.testing import AsyncHTTPTestCase diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py index 38a8eacc9..ba40ccf8d 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import tornado.escape from tornado.escape import utf8, xhtml_escape, xhtml_unescape, url_escape, url_unescape, to_unicode, json_decode, json_encode diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py index b25d1050f..0c547fc46 100644 --- a/tornado/test/gen_test.py +++ b/tornado/test/gen_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import functools from tornado.escape import url_escape from tornado.httpclient import AsyncHTTPClient diff --git a/tornado/test/gettext_translations/extract_me.py b/tornado/test/gettext_translations/extract_me.py index e2d7476bb..75406ecc7 100644 --- a/tornado/test/gettext_translations/extract_me.py +++ b/tornado/test/gettext_translations/extract_me.py @@ -6,4 +6,6 @@ # 2) Edit tornado_test.po, setting CHARSET and setting msgstr # 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 _("school") diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py index 22af0b299..bc32eb7b7 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import base64 import binascii diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py index 0b1d3dc3a..fde10684b 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado import httpclient, simple_httpclient, netutil from tornado.escape import json_decode, utf8, _unicode, recursive_unicode, native_str from tornado.httpserver import HTTPServer diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py index 77534561e..6a13d022b 100644 --- a/tornado/test/httputil_test.py +++ b/tornado/test/httputil_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.httputil import url_concat, parse_multipart_form_data, HTTPHeaders from tornado.escape import utf8 from tornado.log import gen_log diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py index f6a1673c9..f4b2aaa7f 100644 --- a/tornado/test/import_test.py +++ b/tornado/test/import_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.test.util import unittest diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index d3efb4424..44ad8960c 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import contextlib import datetime import functools diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py index 706f596ca..13bb5917a 100644 --- a/tornado/test/iostream_test.py +++ b/tornado/test/iostream_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado import netutil from tornado.ioloop import IOLoop from tornado.iostream import IOStream, SSLIOStream, PipeIOStream diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py index f23440c24..5527a63b4 100644 --- a/tornado/test/locale_test.py +++ b/tornado/test/locale_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import tornado.locale diff --git a/tornado/test/log_test.py b/tornado/test/log_test.py index ff75523c7..3bcf4a1a8 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import contextlib import glob diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py index a2966b2be..e4f149fc3 100644 --- a/tornado/test/netutil_test.py +++ b/tornado/test/netutil_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import socket diff --git a/tornado/test/options_test.py b/tornado/test/options_test.py index c774dd8ff..66e6ffdf8 100644 --- a/tornado/test/options_test.py +++ b/tornado/test/options_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import sys diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index 2ea33841c..0f5ca5ad2 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import logging import os import signal diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py index be5d696bd..dad544bca 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import logging import textwrap import sys diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index 66faed1e4..7ca61b5fb 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import collections from contextlib import closing diff --git a/tornado/test/stack_context_test.py b/tornado/test/stack_context_test.py index 53c640f8a..ba4e76869 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado.log import app_log from tornado.stack_context import StackContext, wrap, NullContext diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py index 14047e2d7..2ad9876a9 100644 --- a/tornado/test/template_test.py +++ b/tornado/test/template_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import traceback diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py index 7fcbda8fd..428b8a101 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import time from tornado.testing import AsyncTestCase from tornado.test.util import unittest diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py index 254433670..d4bdaa10e 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import shutil diff --git a/tornado/test/util.py b/tornado/test/util.py index b048b5027..8d76343ca 100644 --- a/tornado/test/util.py +++ b/tornado/test/util.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import os import sys diff --git a/tornado/test/util_test.py b/tornado/test/util_test.py index 068f8d9f3..db4b0bcc1 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import sys from tornado.escape import utf8 diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index 255a85b1b..5a3ebd1bb 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from tornado import gen from tornado.escape import json_decode, utf8, to_unicode, recursive_unicode, native_str, to_basestring from tornado.iostream import IOStream diff --git a/tornado/test/wsgi_test.py b/tornado/test/wsgi_test.py index 1d832adf5..e2b261084 100644 --- a/tornado/test/wsgi_test.py +++ b/tornado/test/wsgi_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from wsgiref.validate import validator from tornado.escape import json_decode diff --git a/tornado/testing.py b/tornado/testing.py index bca68999d..68de1a7db 100644 --- a/tornado/testing.py +++ b/tornado/testing.py @@ -18,7 +18,7 @@ inheritance. See the docstrings for each class/function below for more information. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement from cStringIO import StringIO try: @@ -496,7 +496,7 @@ def main(**kwargs): kwargs['buffer'] = True if __name__ == '__main__' and len(argv) == 1: - print >> sys.stderr, "No tests specified" + print("No tests specified", file=sys.stderr) sys.exit(1) try: # In order to be able to run tests by their fully-qualified name diff --git a/tornado/util.py b/tornado/util.py index 0dda16506..429c0c17c 100644 --- a/tornado/util.py +++ b/tornado/util.py @@ -1,6 +1,6 @@ """Miscellaneous utility functions.""" -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import zlib diff --git a/tornado/web.py b/tornado/web.py index 446a330c2..17758919b 100644 --- a/tornado/web.py +++ b/tornado/web.py @@ -49,7 +49,7 @@ threads it is important to use IOLoop.add_callback to transfer control back to the main thread before finishing the request. """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement import Cookie import base64 diff --git a/tornado/websocket.py b/tornado/websocket.py index 08f2e0fe6..3b68be186 100644 --- a/tornado/websocket.py +++ b/tornado/websocket.py @@ -17,7 +17,7 @@ communication between the browser and server. documentation for caveats). """ -from __future__ import absolute_import, division, with_statement +from __future__ import absolute_import, division, print_function, with_statement # Author: Jacob Kristhammar, 2010 import array diff --git a/tornado/wsgi.py b/tornado/wsgi.py index 3cb08502e..77163ea0c 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, with_statement +from __future__ import absolute_import, division, print_function, with_statement import Cookie import httplib