From 80c6d09197b3df053a17e97ef439d95d347af858 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Fri, 7 Sep 2012 13:36:41 -0400
Subject: [PATCH] Remove unused imports

(imported from commit 9f5c226708e44935e8d32c18ea7dd1ad2615d8d5)
---
 humbug/urls.py                           | 2 +-
 zephyr/decorator.py                      | 1 -
 zephyr/management/commands/clear_db.py   | 2 +-
 zephyr/management/commands/runtornado.py | 4 ++--
 zephyr/tests.py                          | 1 -
 zephyr/views.py                          | 3 +--
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/humbug/urls.py b/humbug/urls.py
index 259457c39d..f5585aa4b1 100644
--- a/humbug/urls.py
+++ b/humbug/urls.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
 import os.path
 
 # Uncomment the next two lines to enable the admin:
diff --git a/zephyr/decorator.py b/zephyr/decorator.py
index 70a140cce1..c297170bf6 100644
--- a/zephyr/decorator.py
+++ b/zephyr/decorator.py
@@ -1,4 +1,3 @@
-import tornado.web
 import types
 
 class TornadoAsyncException(Exception): pass
diff --git a/zephyr/management/commands/clear_db.py b/zephyr/management/commands/clear_db.py
index 9987ba824f..a9008fd218 100644
--- a/zephyr/management/commands/clear_db.py
+++ b/zephyr/management/commands/clear_db.py
@@ -1,7 +1,7 @@
 from django.core.management.base import NoArgsCommand
 
 from django.contrib.auth.models import User
-from zephyr.models import Zephyr, UserProfile, ZephyrClass, Recipient, Subscription
+from zephyr.models import Zephyr, UserProfile, ZephyrClass, Recipient
 from django.contrib.sessions.models import Session
 
 class Command(NoArgsCommand):
diff --git a/zephyr/management/commands/runtornado.py b/zephyr/management/commands/runtornado.py
index 20f25fedf9..030187a9e3 100644
--- a/zephyr/management/commands/runtornado.py
+++ b/zephyr/management/commands/runtornado.py
@@ -85,7 +85,7 @@ class Command(BaseCommand):
             print "Tornado server is running at http://%s:%s/" % (addr, port)
             print "Quit the server with %s." % quit_command
 
-            from tornado.web import FallbackHandler, StaticFileHandler
+            from tornado.web import FallbackHandler
             django_app = wsgi.WSGIContainer(WSGIHandler())
 
             try:
@@ -150,7 +150,7 @@ class AsyncDjangoHandler(tornado.web.RequestHandler, base.BaseHandler):
         return inner_func
 
     def get(self):
-        from tornado.wsgi import HTTPRequest, WSGIContainer
+        from tornado.wsgi import WSGIContainer
         from django.core.handlers.wsgi import WSGIRequest, STATUS_CODE_TEXT
         import urllib
 
diff --git a/zephyr/tests.py b/zephyr/tests.py
index 8bd7c42261..708538c366 100644
--- a/zephyr/tests.py
+++ b/zephyr/tests.py
@@ -7,7 +7,6 @@ from zephyr.models import Zephyr, UserProfile, ZephyrClass, Recipient, Subscript
     filter_by_subscriptions, Realm
 
 import datetime
-import os
 import simplejson
 import subprocess
 subprocess.call("zephyr/tests/generate-fixtures");
diff --git a/zephyr/views.py b/zephyr/views.py
index 7adc4c125a..d70befc8f4 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -9,11 +9,10 @@ from django.utils.timezone import utc
 
 from django.contrib.auth.models import User
 from zephyr.models import Zephyr, UserProfile, ZephyrClass, Subscription, \
-    Recipient, filter_by_subscriptions, get_display_recipient, get_huddle, \
+    Recipient, get_display_recipient, get_huddle, \
     create_user_profile, Realm, UserMessage, create_zephyr_class
 from zephyr.forms import RegistrationForm
 
-import tornado.web
 from zephyr.decorator import asynchronous
 
 import datetime