Remove unused imports, add a few missing ones

diff --git a/demos/facebook/facebook.py b/demos/facebook/facebook.py
index 1428c709f5114773664ced656d2075eee066f8de..c6b8c2468978dc8d87de89ea0a6144ffadd3c306 100755 (executable)
--- a/demos/facebook/facebook.py
+++ b/demos/facebook/facebook.py
@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
 import os.path
 import tornado.auth
 import tornado.escape
@@ -22,7 +21,6 @@ import tornado.httpserver
 import tornado.ioloop
 import tornado.options
 import tornado.web
-import uimodules
 
 from tornado.options import define, options
 
@@ -76,7 +74,6 @@ class MainHandler(BaseHandler, tornado.auth.FacebookGraphMixin):
         self.render("stream.html", stream=stream)
 
 
-import logging
 class AuthLoginHandler(BaseHandler, tornado.auth.FacebookGraphMixin):
     @tornado.web.asynchronous
     def get(self):

diff --git a/tornado/auth.py b/tornado/auth.py
index 574bb55fbbaf807dd104a22cfc75f7678c567ca5..056e8a6e445c925f4225c0cf73614f1b33c59b95 100644 (file)
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@ -59,7 +59,6 @@ import uuid
 from tornado import httpclient
 from tornado import escape
 from tornado.httputil import url_concat
-from tornado.ioloop import IOLoop
 from tornado.util import bytes_type
 
 class OpenIdMixin(object):

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index e911596a616ce92a21effca95d16d6b4857816a6..8b4e97e800d2c4021800834679ed481bbe4c6379 100644 (file)
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -19,15 +19,9 @@
 from __future__ import with_statement
 
 import cStringIO
-import calendar
 import collections
-import email.utils
-import errno
-import httplib
 import logging
-import os
 import pycurl
-import sys
 import threading
 import time
 

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index ac3e7f7ff6806919aed23da65fc495e56d994fb4..781ce6e3b097f10a4be6631ff62ae6c91d50810e 100644 (file)
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@ -1,3 +1,5 @@
+import calendar
+import email.utils
 import httplib
 import os
 import time

diff --git a/tornado/httputil.py b/tornado/httputil.py
index 97d796b83ab1aa2b4fc14b438f3905e89507fc54..fe3dcafe6269dfacb4d8cf713a7c258616ad3c30 100644 (file)
--- a/tornado/httputil.py
+++ b/tornado/httputil.py
@@ -16,6 +16,7 @@
 
 """HTTP utility code shared by clients and servers."""
 
+import logging
 import urllib
 import re
 

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index f1a4794b75297069e1e769e9f99db4c27319e3b2..4eef01afa76c505bde3a9a0512a7c8ead318dcc9 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -507,7 +507,6 @@ class _KQueue(object):
         events = {}
         for kevent in kevents:
             fd = kevent.ident
-            flags = 0
             if kevent.filter == select.KQ_FILTER_READ:
                 events[fd] = events.get(fd, 0) | IOLoop.READ
             if kevent.filter == select.KQ_FILTER_WRITE:

diff --git a/tornado/iostream.py b/tornado/iostream.py
index 38c1a2ba3834711d6e78bef48a9cb626a92c6698..e47814552c1a457473d5f5781bf636e56713903f 100644 (file)
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -20,7 +20,6 @@ from __future__ import with_statement
 
 import collections
 import errno
-import functools
 import logging
 import socket
 import sys

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index d5d2e8fdfe6e5c7b99953292aa1f8652e8ccb2dd..ad15a2d32d71470ff182f5e1a1503e5623abb06f 100644 (file)
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -13,7 +13,6 @@ import base64
 import collections
 import contextlib
 import copy
-import errno
 import functools
 import logging
 import os.path

diff --git a/tornado/stack_context.py b/tornado/stack_context.py
index 61b4260616bd6b730da29044ad58373f238c2153..e59d5c01a463294a9e24b0d469cced8edccb4a98 100644 (file)
--- a/tornado/stack_context.py
+++ b/tornado/stack_context.py
@@ -51,7 +51,6 @@ from __future__ import with_statement
 import contextlib
 import functools
 import itertools
-import logging
 import sys
 import threading
 

diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
index 4a7c1e9fc38126ed100d4f82f292bb11f3e0089d..999a1a131751d2f8d3f5e3781cb3c29dbe2c8f5d 100644 (file)
--- a/tornado/test/httpclient_test.py
+++ b/tornado/test/httpclient_test.py
@@ -5,7 +5,6 @@ from __future__ import with_statement
 import base64
 import binascii
 import gzip
-import logging
 import socket
 
 from contextlib import closing

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index def4f0fd2f292c73ca2de261b42cbf90cc0b61e2..69ea01cdf6954fb7803afcc2b065b9b7d6c3515a 100644 (file)
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -2,17 +2,11 @@
 
 from tornado import httpclient, simple_httpclient
 from tornado.escape import json_decode, utf8, _unicode, recursive_unicode
-from tornado.iostream import IOStream
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.testing import AsyncHTTPTestCase, LogTrapTestCase
 from tornado.util import b, bytes_type
 from tornado.web import Application, RequestHandler
-import logging
 import os
-import re
-import socket
-import unittest
-import urllib
 
 try:
     import ssl

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index 2c718a79ec67b16efab45ab94dff40df98525216..2c0f5f12eee43268533481646601f1cd44a291a8 100644 (file)
--- a/tornado/test/ioloop_test.py
+++ b/tornado/test/ioloop_test.py
@@ -3,7 +3,6 @@
 import unittest
 import time
 
-from tornado import ioloop
 from tornado.testing import AsyncTestCase, LogTrapTestCase
 
 class TestIOLoop(AsyncTestCase, LogTrapTestCase):

diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
index 87ffabadb35d4cb1357761ddade7b2f0e7836ca0..39f5acb9a6d9f22ceae42e496d9f55dcf40beae1 100644 (file)
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@ -9,7 +9,6 @@ import binascii
 import logging
 import re
 import socket
-import tornado.ioloop
 
 class CookieTestRequestHandler(RequestHandler):
     # stub out enough methods to make the secure_cookie functions work

diff --git a/tornado/test/wsgi_test.py b/tornado/test/wsgi_test.py
index 377a36f9eddca575c084938653da2aae33f4735d..edca7c51030e83237dc37ce28591b95fd3b8c024 100644 (file)
--- a/tornado/test/wsgi_test.py
+++ b/tornado/test/wsgi_test.py
@@ -1,6 +1,5 @@
 from wsgiref.validate import validator
 
-from tornado.escape import json_encode
 from tornado.testing import AsyncHTTPTestCase, LogTrapTestCase
 from tornado.util import b
 from tornado.web import RequestHandler

diff --git a/tornado/testing.py b/tornado/testing.py
index 2e58b6c8aa6d097d8f5320341715c4b63445fa14..cd6837cfaac29e2d37db800cc2856cb8ebab203b 100644 (file)
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -22,13 +22,11 @@ from tornado.httpclient import AsyncHTTPClient
 from tornado.httpserver import HTTPServer
 from tornado.stack_context import StackContext, NullContext
 import contextlib
-import functools
 import logging
 import os
 import sys
 import time
 import tornado.ioloop
-import traceback
 import unittest
 
 _next_port = 10000

diff --git a/tornado/web.py b/tornado/web.py
index bff107aa7a37d9e2e0f8a43128392c7a0c998754..6e0d6df5993696553e4f93031836016940a16500 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -55,7 +55,6 @@ import Cookie
 import base64
 import binascii
 import calendar
-import contextlib
 import datetime
 import email.utils
 import functools

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 1170cff8be0ca259fe24126752e76d26378a3a34..316ffb5f60ab86939d86008139505a7a2a6dd589 100644 (file)
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -16,7 +16,6 @@
 import functools
 import hashlib
 import logging
-import re
 import struct
 import time
 import tornado.escape