Re-run our custom fixers to normalize future imports

diff --git a/maint/scripts/custom_fixers/fix_unicode_literal.py b/maint/scripts/custom_fixers/fix_unicode_literal.py
index cfc6b3add08d85e18415e61f8d574f3010f06f97..560c277668c34d6e7c642d4b9ea34570a3a20366 100644 (file)
--- a/maint/scripts/custom_fixers/fix_unicode_literal.py
+++ b/maint/scripts/custom_fixers/fix_unicode_literal.py
@@ -3,7 +3,8 @@ from lib2to3.pgen2 import token
 from lib2to3 import fixer_base
 from lib2to3.fixer_util import Name, Call
 
-_literal_re = re.compile(ur"[uU][rR]?[\'\"]")
+_literal_re = re.compile(r"[uU][rR]?[\'\"]")
+
 
 class FixUnicodeLiteral(fixer_base.BaseFix):
     BM_compatible = True

diff --git a/tornado/_locale_data.py b/tornado/_locale_data.py
index caf0f06051dea955716c4cd0dd9042d267311f9c..47c1df618c88804de9496715a3f7c7a110e82ab5 100644 (file)
--- a/tornado/_locale_data.py
+++ b/tornado/_locale_data.py
@@ -17,6 +17,8 @@
 
 """Data used by the tornado.locale module."""
 
+from __future__ import absolute_import, division, print_function, with_statement
+
 # NOTE: This file is supposed to contain unicode strings, which is
 # exactly what you'd get with e.g. u"Español" in most python versions.
 # However, Python 3.2 doesn't support the u"" syntax, so we use a u()

diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py
index 43a6d5162cf20bb84cb5b7c096f5a041764f8133..020ec105e0dd835ff6a9385f4c4b86a25fd3a2c7 100644 (file)
--- a/tornado/test/locks_test.py
+++ b/tornado/test/locks_test.py
@@ -10,6 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+
+from __future__ import absolute_import, division, print_function, with_statement
 from datetime import timedelta
 
 from tornado import gen, locks

diff --git a/tornado/test/queues_test.py b/tornado/test/queues_test.py
index e8f66c611881fa3f36287d8ed122ab3ff408c10d..e72b6ed5f8dce12f198f999ccde82347b0e02977 100644 (file)
--- a/tornado/test/queues_test.py
+++ b/tornado/test/queues_test.py
@@ -10,6 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+
+from __future__ import absolute_import, division, print_function, with_statement
 from datetime import timedelta
 from random import random
 

diff --git a/tornado/test/tcpserver_test.py b/tornado/test/tcpserver_test.py
index d85076a44721fde58bc6b6687beb84ac670fcd75..c01c04ddfb2baf903a76fbf5dfa182c3c2d21172 100644 (file)
--- a/tornado/test/tcpserver_test.py
+++ b/tornado/test/tcpserver_test.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, with_statement
 import socket
 
 from tornado import gen

diff --git a/tornado/web.py b/tornado/web.py
index 42f41e19b88a50558409b9537d213cd9bda5edea..1cacd7c0a8b82df53bae2a78d5e20966558b6d06 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -56,9 +56,7 @@ request.
 
 """
 
-from __future__ import (absolute_import, division,
-                        print_function, with_statement)
-
+from __future__ import absolute_import, division, print_function, with_statement
 
 import base64
 import binascii

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 268c770e2539a8eb75319af9776b34738f079f4b..11e526687dc149c94d27133344c1a4f897d01bfa 100644 (file)
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -16,8 +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, with_statement
 # Author: Jacob Kristhammar, 2010
 
 import base64