From: Ben Darnell Date: Thu, 9 Feb 2012 08:17:58 +0000 (-0800) Subject: Turn on __future__ division too. X-Git-Tag: v2.3.0~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58a7ff10a80b08f1b95d5eb410d91501e97f1d39;p=thirdparty%2Ftornado.git Turn on __future__ division too. All existing uses of division were already using a float for at least one operand (except the tests that just do 1/0 as a quick way to throw an exception). We have now turned on all the __future__ options available in python2.5. --- diff --git a/maint/scripts/custom_fixers/fix_future_imports.py b/maint/scripts/custom_fixers/fix_future_imports.py index c371a5544..3037abfed 100644 --- a/maint/scripts/custom_fixers/fix_future_imports.py +++ b/maint/scripts/custom_fixers/fix_future_imports.py @@ -21,6 +21,7 @@ class FixFutureImports(fixer_base.BaseFix): def new_future_import(self, old): new = FromImport("__future__", [Name("absolute_import", prefix=" "), Comma(), + Name("division", prefix=" "), Comma(), Name("with_statement", prefix=" ")]) if old is not None: new.prefix = old.prefix diff --git a/tornado/__init__.py b/tornado/__init__.py index 8ab36594d..1ea272662 100644 --- a/tornado/__init__.py +++ b/tornado/__init__.py @@ -16,7 +16,7 @@ """The Tornado web server and tools.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement # version is a human-readable version number. diff --git a/tornado/auth.py b/tornado/auth.py index 9f1a7a7a6..e20685496 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, with_statement +from __future__ import absolute_import, division, with_statement import base64 import binascii diff --git a/tornado/autoreload.py b/tornado/autoreload.py index 4d23f1984..2464f3468 100644 --- a/tornado/autoreload.py +++ b/tornado/autoreload.py @@ -26,7 +26,7 @@ and Google AppEngine. It also will not work correctly when HTTPServer's multi-process mode is used. """ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import functools import logging diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py index 9cfbbb74c..c6213c05d 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, with_statement +from __future__ import absolute_import, division, with_statement import cStringIO import collections diff --git a/tornado/database.py b/tornado/database.py index 26e4a603a..a74879b03 100644 --- a/tornado/database.py +++ b/tornado/database.py @@ -16,7 +16,7 @@ """A lightweight wrapper around MySQLdb.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import copy import MySQLdb.constants diff --git a/tornado/escape.py b/tornado/escape.py index a9de7e396..2136e6499 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, with_statement +from __future__ import absolute_import, division, with_statement import htmlentitydefs import re diff --git a/tornado/gen.py b/tornado/gen.py index 21ba8f827..04bc4039e 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, with_statement +from __future__ import absolute_import, division, with_statement import functools import operator diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 5b4bac240..345b9b324 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, with_statement +from __future__ import absolute_import, division, with_statement import calendar import email.utils diff --git a/tornado/httpserver.py b/tornado/httpserver.py index 11602d287..eabb5debe 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, with_statement +from __future__ import absolute_import, division, with_statement import Cookie import logging diff --git a/tornado/httputil.py b/tornado/httputil.py index a197707b0..4f86c3782 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, with_statement +from __future__ import absolute_import, division, with_statement import logging import urllib diff --git a/tornado/ioloop.py b/tornado/ioloop.py index 44627f6c7..be294c45f 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, with_statement +from __future__ import absolute_import, division, with_statement import datetime import errno diff --git a/tornado/iostream.py b/tornado/iostream.py index 95c659615..b9ba13548 100644 --- a/tornado/iostream.py +++ b/tornado/iostream.py @@ -16,7 +16,7 @@ """A utility class to write to and read from a non-blocking socket.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import collections import errno diff --git a/tornado/locale.py b/tornado/locale.py index dd2a0e233..f36ed5a6b 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, with_statement +from __future__ import absolute_import, division, with_statement import csv import datetime diff --git a/tornado/netutil.py b/tornado/netutil.py index 517367791..416d03062 100644 --- a/tornado/netutil.py +++ b/tornado/netutil.py @@ -16,7 +16,7 @@ """Miscellaneous network utility code.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import errno import logging diff --git a/tornado/options.py b/tornado/options.py index a7344421b..db9521ea4 100644 --- a/tornado/options.py +++ b/tornado/options.py @@ -48,7 +48,7 @@ kwarg to define). We also accept multi-value options. See the documentation for define() below. """ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import datetime import logging diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py index 086fe70b5..68cf2d218 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, with_statement +from __future__ import absolute_import, division, with_statement import os diff --git a/tornado/platform/interface.py b/tornado/platform/interface.py index 0879b5a0b..c08f8eaf3 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, with_statement +from __future__ import absolute_import, division, with_statement def set_close_exec(fd): """Sets the close-on-exec bit (``FD_CLOEXEC``)for a file descriptor.""" diff --git a/tornado/platform/posix.py b/tornado/platform/posix.py index 40afbad4e..ae5abed82 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, with_statement +from __future__ import absolute_import, division, with_statement import fcntl import os diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py index ed426fcc3..7aa1a805d 100644 --- a/tornado/platform/twisted.py +++ b/tornado/platform/twisted.py @@ -44,7 +44,7 @@ before closing the `IOLoop`. This module has been tested with Twisted versions 11.0.0 and 11.1.0. """ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import functools import logging diff --git a/tornado/platform/windows.py b/tornado/platform/windows.py index cef82e901..16fd66090 100644 --- a/tornado/platform/windows.py +++ b/tornado/platform/windows.py @@ -2,7 +2,7 @@ # for production use. -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import ctypes import ctypes.wintypes import socket diff --git a/tornado/process.py b/tornado/process.py index 4958fa499..5a33e696b 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -16,7 +16,7 @@ """Utilities for working with multiple processes.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import errno import logging diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py index a6cba17ba..1f35b0989 100644 --- a/tornado/simple_httpclient.py +++ b/tornado/simple_httpclient.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from tornado.escape import utf8, _unicode, native_str from tornado.httpclient import HTTPRequest, HTTPResponse, HTTPError, AsyncHTTPClient, main diff --git a/tornado/stack_context.py b/tornado/stack_context.py index fe229cdcb..c3fb02234 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, with_statement +from __future__ import absolute_import, division, with_statement import contextlib import functools diff --git a/tornado/template.py b/tornado/template.py index 69813eb5a..c3e3cccea 100644 --- a/tornado/template.py +++ b/tornado/template.py @@ -172,7 +172,7 @@ with ``{# ... #}``. Same as the python ``while`` statement. """ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import cStringIO import datetime diff --git a/tornado/test/auth_test.py b/tornado/test/auth_test.py index 06903a0bc..e77396d43 100644 --- a/tornado/test/auth_test.py +++ b/tornado/test/auth_test.py @@ -4,7 +4,7 @@ # python 3) -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from tornado.auth import OpenIdMixin, OAuthMixin, OAuth2Mixin from tornado.escape import json_decode from tornado.testing import AsyncHTTPTestCase, LogTrapTestCase diff --git a/tornado/test/curl_httpclient_test.py b/tornado/test/curl_httpclient_test.py index 35aaf9758..1085462cb 100644 --- a/tornado/test/curl_httpclient_test.py +++ b/tornado/test/curl_httpclient_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from tornado.test.httpclient_test import HTTPClientCommonTestCase try: diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py index b34fcab50..37c938317 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, with_statement +from __future__ import absolute_import, division, with_statement import tornado.escape import unittest diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py index 2f40e774d..e4e018c73 100644 --- a/tornado/test/gen_test.py +++ b/tornado/test/gen_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import functools from tornado.escape import url_escape from tornado.httpclient import AsyncHTTPClient diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py index bf1e19cd2..8cfa8f91a 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, with_statement +from __future__ import absolute_import, division, with_statement import base64 import binascii diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py index ba0e18d2e..5f75c7525 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, with_statement +from __future__ import absolute_import, division, 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 00f740d82..440f6e6e7 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, with_statement +from __future__ import absolute_import, division, with_statement from tornado.httputil import url_concat, parse_multipart_form_data, HTTPHeaders from tornado.escape import utf8 from tornado.testing import LogTrapTestCase diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py index 7a25fdb5a..030bb20eb 100644 --- a/tornado/test/import_test.py +++ b/tornado/test/import_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import unittest class ImportTest(unittest.TestCase): diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py index b01afce13..159f91858 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, with_statement +from __future__ import absolute_import, division, with_statement import datetime import unittest import time diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py index 0509205f9..c58da56f4 100644 --- a/tornado/test/iostream_test.py +++ b/tornado/test/iostream_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from tornado import netutil from tornado.ioloop import IOLoop from tornado.iostream import IOStream diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index 1546f3dde..28f4e06d1 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, with_statement +from __future__ import absolute_import, division, with_statement import logging import os import signal diff --git a/tornado/test/run_pyversion_tests.py b/tornado/test/run_pyversion_tests.py index 672d49561..c150656e0 100755 --- a/tornado/test/run_pyversion_tests.py +++ b/tornado/test/run_pyversion_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """Runs the tornado test suite with all supported python interpreters.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import os import subprocess diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py index 14782ac7b..6827de0aa 100755 --- a/tornado/test/runtests.py +++ b/tornado/test/runtests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import unittest TEST_MODULES = [ diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py index 4d241b027..35b30877e 100644 --- a/tornado/test/simple_httpclient_test.py +++ b/tornado/test/simple_httpclient_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import collections import gzip diff --git a/tornado/test/stack_context_test.py b/tornado/test/stack_context_test.py index 1fbfa4d72..73c844020 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, with_statement +from __future__ import absolute_import, division, with_statement from tornado.stack_context import StackContext, wrap from tornado.testing import AsyncHTTPTestCase, AsyncTestCase, LogTrapTestCase diff --git a/tornado/test/template_test.py b/tornado/test/template_test.py index bf9b3f039..546778848 100644 --- a/tornado/test/template_test.py +++ b/tornado/test/template_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement import traceback diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py index 3a40fb4af..c2887396f 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, with_statement +from __future__ import absolute_import, division, with_statement import unittest from tornado.testing import AsyncTestCase, LogTrapTestCase diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py index 9d4e5c9d8..60b1ff4aa 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, with_statement +from __future__ import absolute_import, division, with_statement import os import thread diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py index c84755523..11a4d5609 100644 --- a/tornado/test/web_test.py +++ b/tornado/test/web_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from tornado.escape import json_decode, utf8, to_unicode, recursive_unicode, native_str from tornado.iostream import IOStream from tornado.template import DictLoader diff --git a/tornado/test/wsgi_test.py b/tornado/test/wsgi_test.py index ac4564e4f..185b4683c 100644 --- a/tornado/test/wsgi_test.py +++ b/tornado/test/wsgi_test.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement from wsgiref.validate import validator from tornado.testing import AsyncHTTPTestCase, LogTrapTestCase diff --git a/tornado/testing.py b/tornado/testing.py index 15b59ae0f..f607de843 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, with_statement +from __future__ import absolute_import, division, with_statement from cStringIO import StringIO try: diff --git a/tornado/util.py b/tornado/util.py index f597becb7..b08bd9ad6 100644 --- a/tornado/util.py +++ b/tornado/util.py @@ -1,6 +1,6 @@ """Miscellaneous utility functions.""" -from __future__ import absolute_import, with_statement +from __future__ import absolute_import, division, with_statement class ObjectDict(dict): """Makes a dictionary behave like an object.""" diff --git a/tornado/web.py b/tornado/web.py index 910089362..aa42855f6 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, with_statement +from __future__ import absolute_import, division, with_statement import Cookie import base64 diff --git a/tornado/websocket.py b/tornado/websocket.py index 773b94bfc..05ba286d7 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, with_statement +from __future__ import absolute_import, division, with_statement # Author: Jacob Kristhammar, 2010 import array diff --git a/tornado/wsgi.py b/tornado/wsgi.py index 08ce4eaa9..783b6b2e9 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, with_statement +from __future__ import absolute_import, division, with_statement import Cookie import cgi