From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 25 May 2014 03:23:46 +0000 (-0400)
Subject: Pyflakes cleanup.
X-Git-Tag: v4.0.0b1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faa56d331123f34fe6bb17fc2fb04e25c0458c41;p=thirdparty%2Ftornado.git

Pyflakes cleanup.

Includes real python3 bugfixes for tornado.auth.FacebookMixin and
tornado.platform.twisted.
---

diff --git a/tornado/auth.py b/tornado/auth.py
index 9baac9baf..6b1dd10e7 100644
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@ -73,6 +73,10 @@ try:
 except ImportError:
     import urllib as urllib_parse  # py2
 
+try:
+    long  # py2
+except NameError:
+    long = int  # py3
 
 class AuthError(Exception):
     pass
diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py
index 5ef4e9b0f..889aa3c45 100644
--- a/tornado/platform/twisted.py
+++ b/tornado/platform/twisted.py
@@ -91,6 +91,11 @@ from tornado.netutil import Resolver
 from tornado.stack_context import NullContext, wrap
 from tornado.ioloop import IOLoop
 
+try:
+    long  # py2
+except NameError:
+    long = int  # py3
+
 
 @implementer(IDelayedCall)
 class TornadoDelayedCall(object):
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 2d90b0470..ddbaa9c00 100644
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -6,7 +6,7 @@ from tornado.escape import utf8, _unicode
 from tornado.httpclient import HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy
 from tornado import httputil
 from tornado.http1connection import HTTP1Connection, HTTP1ConnectionParameters
-from tornado.iostream import IOStream, SSLIOStream, StreamClosedError
+from tornado.iostream import StreamClosedError
 from tornado.netutil import Resolver, OverrideResolver
 from tornado.log import gen_log
 from tornado import stack_context
diff --git a/tornado/tcpclient.py b/tornado/tcpclient.py
index f29c29c1c..4354a2ba2 100644
--- a/tornado/tcpclient.py
+++ b/tornado/tcpclient.py
@@ -23,7 +23,7 @@ import socket
 
 from tornado.concurrent import Future
 from tornado.ioloop import IOLoop
-from tornado.iostream import IOStream, SSLIOStream
+from tornado.iostream import IOStream
 from tornado import gen
 from tornado.netutil import Resolver
 
diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index eef512695..d7762a730 100644
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -578,8 +578,8 @@ class WSGISafeWebTest(WebTestCase):
                 "/decode_arg/%E9?foo=%E9&encoding=latin1",
                 "/decode_arg_kw/%E9?foo=%E9&encoding=latin1",
                 ]
-        for url in urls:
-            response = self.fetch(url)
+        for req_url in urls:
+            response = self.fetch(req_url)
             response.rethrow()
             data = json_decode(response.body)
             self.assertEqual(data, {u('path'): [u('unicode'), u('\u00e9')],
@@ -605,8 +605,8 @@ class WSGISafeWebTest(WebTestCase):
         # These urls are all equivalent.
         urls = ["/decode_arg/1%20%2B%201?foo=1%20%2B%201&encoding=utf-8",
                 "/decode_arg/1%20+%201?foo=1+%2B+1&encoding=utf-8"]
-        for url in urls:
-            response = self.fetch(url)
+        for req_url in urls:
+            response = self.fetch(req_url)
             response.rethrow()
             data = json_decode(response.body)
             self.assertEqual(data, {u('path'): [u('unicode'), u('1 + 1')],