From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 25 Oct 2015 15:20:10 +0000 (-0400)
Subject: Re-run our custom fixers to normalize future imports
X-Git-Tag: v4.3.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5268068cb5122bc689cd88dde0bb36137ffd0e1e;p=thirdparty%2Ftornado.git

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 cfc6b3add..560c27766 100644
--- 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 caf0f0605..47c1df618 100644
--- 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 43a6d5162..020ec105e 100644
--- 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 e8f66c611..e72b6ed5f 100644
--- 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 d85076a44..c01c04ddf 100644
--- 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 42f41e19b..1cacd7c0a 100644
--- 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 268c770e2..11e526687 100644
--- 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