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.

maint/scripts/custom_fixers/fix_future_imports.py

@@ -21,6 +21,7 @@ def start_tree(self, tree, filename):
     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

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.
 

tornado/auth.py

@@ -44,7 +44,7 @@ def _on_auth(self, user):
             # 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

tornado/autoreload.py

@@ -26,7 +26,7 @@
 multi-process mode is used.
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 import functools
 import logging

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

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

tornado/escape.py

@@ -20,7 +20,7 @@
 have crept in over time.
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 import htmlentitydefs
 import re

tornado/gen.py

@@ -62,7 +62,7 @@ def get(self):
 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

tornado/httpclient.py

@@ -29,7 +29,7 @@
 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

tornado/httpserver.py

@@ -24,7 +24,7 @@ class except to start a server at the beginning of the process
 `tornado.web.RequestHandler.request`.
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 import Cookie
 import logging

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

tornado/ioloop.py

@@ -26,7 +26,7 @@
 `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

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

tornado/locale.py

@@ -39,7 +39,7 @@
 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

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

tornado/options.py

@@ -48,7 +48,7 @@ def connect():
 for define() below.
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 import datetime
 import logging

tornado/platform/auto.py

@@ -23,7 +23,7 @@
     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
 

tornado/platform/interface.py

@@ -21,7 +21,7 @@
 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."""

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

tornado/platform/twisted.py

@@ -44,7 +44,7 @@
 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

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

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

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

tornado/stack_context.py

@@ -66,7 +66,7 @@ def die_on_error():
   block that references your `StackContext`.
 '''
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 import contextlib
 import functools

tornado/template.py

@@ -172,7 +172,7 @@ def add(x, y):
     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

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

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:

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
 

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

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

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

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

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):

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

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

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

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

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 = [

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

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

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
 

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
 

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

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

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

tornado/testing.py

@@ -18,7 +18,7 @@
 information.
 """
 
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import, division, with_statement
 
 from cStringIO import StringIO
 try:

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."""

tornado/web.py

@@ -49,7 +49,7 @@ def get(self):
 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