From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 4 Mar 2013 04:04:23 +0000 (-0500)
Subject: Pyflakes cleanups.
X-Git-Tag: v3.0.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44215060129b419ab2173f7e85d66fe9d7a5caeb;p=thirdparty%2Ftornado.git

Pyflakes cleanups.
---

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index 721e46c33..ba14db6ce 100644
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -30,7 +30,7 @@ from tornado.log import gen_log
 from tornado import stack_context
 
 from tornado.escape import utf8, native_str
-from tornado.httpclient import HTTPRequest, HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy
+from tornado.httpclient import HTTPResponse, HTTPError, AsyncHTTPClient, main
 from tornado.util import bytes_type
 
 try:
diff --git a/tornado/httputil.py b/tornado/httputil.py
index 94b8ba4f2..85a86a6cd 100644
--- a/tornado/httputil.py
+++ b/tornado/httputil.py
@@ -32,6 +32,10 @@ try:
 except ImportError:
     from http.client import responses  # py3
 
+# responses is unused in this file, but we re-export it to other files.
+# Reference it so pyflakes doesn't complain.
+responses
+
 try:
     from urllib import urlencode  # py2
 except ImportError:
diff --git a/tornado/platform/caresresolver.py b/tornado/platform/caresresolver.py
index 7442b33c3..b2b43b443 100644
--- a/tornado/platform/caresresolver.py
+++ b/tornado/platform/caresresolver.py
@@ -1,7 +1,6 @@
 import pycares
 import socket
 
-from tornado.concurrent import return_future
 from tornado import gen
 from tornado.ioloop import IOLoop
 from tornado.netutil import Resolver, is_valid_ip
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 760b9b484..ed344e729 100644
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import, division, print_function, with_statement
 
 from tornado.escape import utf8, _unicode, native_str
-from tornado.httpclient import HTTPRequest, HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy
+from tornado.httpclient import HTTPResponse, HTTPError, AsyncHTTPClient, main, _RequestProxy
 from tornado.httputil import HTTPHeaders
 from tornado.iostream import IOStream, SSLIOStream
 from tornado.netutil import Resolver, OverrideResolver
diff --git a/tornado/testing.py b/tornado/testing.py
index f0fd6504a..3fc38c1bb 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -46,7 +46,6 @@ import re
 import signal
 import socket
 import sys
-import types
 
 try:
     from io import StringIO  # py3
diff --git a/tornado/websocket.py b/tornado/websocket.py
index b47a37afe..a63860183 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -25,20 +25,16 @@ import base64
 import collections
 import functools
 import hashlib
-import logging
 import os
-import re
-import socket
 import struct
 import time
 import tornado.escape
 import tornado.web
 
-from tornado.concurrent import Future, return_future
-from tornado.escape import utf8, to_unicode, native_str
-from tornado.httputil import HTTPHeaders
+from tornado.concurrent import Future
+from tornado.escape import utf8, native_str
+from tornado import httpclient
 from tornado.ioloop import IOLoop
-from tornado.iostream import IOStream, SSLIOStream
 from tornado.log import gen_log, app_log
 from tornado.netutil import Resolver
 from tornado import simple_httpclient
@@ -49,11 +45,6 @@ try:
 except NameError:
     xrange = range  # py3
 
-try:
-    import urlparse  # py2
-except ImportError:
-    import urllib.parse as urlparse  # py3
-
 class WebSocketHandler(tornado.web.RequestHandler):
     """Subclass this class to create a basic WebSocket handler.
 
@@ -399,7 +390,7 @@ class WebSocketProtocol76(WebSocketProtocol):
 
         Raises ValueError when feed invalid key."""
         number = int(''.join(c for c in key if c.isdigit()))
-        spaces = len([c for c in key if c.isspace()])
+        spaces = len(c for c in key if c.isspace())
         try:
             key_number = number // spaces
         except (ValueError, ZeroDivisionError):
@@ -796,9 +787,9 @@ class _WebSocketClientConnection(simple_httpclient._HTTPConnection):
 def WebSocketConnect(url, io_loop=None, callback=None):
     if io_loop is None:
         io_loop = IOLoop.current()
-    request = simple_httpclient.HTTPRequest(url)
-    request = simple_httpclient._RequestProxy(
-        request, simple_httpclient.HTTPRequest._DEFAULTS)
+    request = httpclient.HTTPRequest(url)
+    request = httpclient._RequestProxy(
+        request, httpclient.HTTPRequest._DEFAULTS)
     conn = _WebSocketClientConnection(io_loop, request)
     if callback is not None:
         io_loop.add_future(conn.connect_future, callback)