Refactor: cleanup unused variables/imports

Author: dcramer

sentry/client/base.py

@@ -7,7 +7,6 @@
 import sys
 import traceback
 import urllib2
-import warnings
 
 from django.core.cache import cache
 from django.template import TemplateSyntaxError
@@ -51,7 +50,7 @@ def send(self, **kwargs):
                     'key': conf.KEY,
                 }
                 try:
-                    response = urlread(url, GET=data, timeout=conf.REMOTE_TIMEOUT)
+                    urlread(url, GET=data, timeout=conf.REMOTE_TIMEOUT)
                 except urllib2.URLError, e:
                     logger.error('Unable to reach Sentry log server: %s' % (e,), exc_info=sys.exc_info(), extra={'remote_url': url})
                     logger.log(kwargs.pop('level', None) or logging.ERROR, kwargs.pop('message', None))

sentry/client/models.py

@@ -7,7 +7,6 @@
 from django.http import Http404
 
 from sentry import conf
-from sentry.client.base import SentryClient
 
 logger = logging.getLogger('sentry.errors')
 

sentry/feeds.py

@@ -1,13 +1,10 @@
-from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse
 from django.utils import feedgenerator
 from django.utils.translation import ugettext_lazy as _
 
 from sentry.models import Message, GroupedMessage
 
-import logging
-
 class MessageFeed(object):
     def __call__(self, request):
         feed_dict = {

sentry/helpers.py

@@ -20,7 +20,7 @@ def get_filters():
             try:
                 module = __import__(module_name, {}, {}, class_name)
                 filter_ = getattr(module, class_name)
-            except Exception, exc:
+            except Exception:
                 logging.exception('Unable to import %s' % (filter_,))
                 continue
             filters.append(filter_)

sentry/management/commands/cleanup_sentry.py

@@ -1,4 +1,4 @@
-from django.core.management.base import CommandError, BaseCommand
+from django.core.management.base import BaseCommand
 
 from sentry.models import Message, GroupedMessage
 

sentry/manager.py

@@ -5,11 +5,9 @@
 
 from django.db import models
 from django.db.models import signals
-from django.template import TemplateSyntaxError
-from django.views.debug import ExceptionReporter
 
 from sentry import conf
-from sentry.helpers import construct_checksum, transform, varmap
+from sentry.helpers import construct_checksum
 
 assert not conf.DATABASE_USING or django.VERSION >= (1, 2), 'The `SENTRY_DATABASE_USING` setting requires Django >= 1.2'
 

sentry/models.py

@@ -6,21 +6,17 @@
 import datetime
 import logging
 import sys
-import traceback
-import warnings
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models, transaction
 from django.db.models import Count
 from django.db.models.signals import post_syncdb
-from django.http import Http404
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 
 from sentry import conf
-from sentry.client.base import SentryClient
-from sentry.helpers import cached_property, construct_checksum, get_db_engine, get_installed_apps, transform
+from sentry.helpers import cached_property, construct_checksum, get_db_engine, transform
 from sentry.manager import GroupedMessageManager, SentryManager
 from sentry.reporter import FakeRequest
 
@@ -142,7 +138,7 @@ def create_sort_index(cls, sender, db, created_models, **kwargs):
         if cls not in created_models:
             return
 
-        from django.db import connections, transaction
+        from django.db import connections
 
         try:
             cursor = connections[db].cursor()

sentry/reporter.py

@@ -1,20 +1,10 @@
-import base64
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-import logging
 from pprint import pformat
 
-from django.conf import settings
-from django.template import (Template, Context, TemplateDoesNotExist,
-    TemplateSyntaxError)
+from django.template import Template, Context, TemplateDoesNotExist
 from django.utils.encoding import smart_unicode
 from django.utils.html import escape
 from django.views.debug import ExceptionReporter, linebreak_iter
 
-from indexer.models import Index
-
 class ImprovedExceptionReporter(ExceptionReporter):
     def __init__(self, request, exc_type, exc_value, frames, template_info=None):
         ExceptionReporter.__init__(self, request, exc_type, exc_value, None)

sentry/templatetags/sentry_helpers.py

@@ -1,6 +1,5 @@
 from django import template
 from django.db.models import Count
-from django.utils import simplejson
 
 from sentry.helpers import get_db_engine
 from sentry.plugins import GroupActionProvider

sentry/tests/tests.py

@@ -15,14 +15,14 @@
 from django.contrib.auth.models import User
 from django.core import mail
 from django.core.handlers.wsgi import WSGIRequest, WSGIHandler
+from django.core.management import call_command
 from django.core.urlresolvers import reverse
 from django.core.signals import got_request_exception
 from django.core.servers import basehttp
 from django.test.client import Client
 from django.test import TestCase
 from django.template import TemplateSyntaxError
 from django.utils.encoding import smart_unicode
-from django.utils import simplejson
 
 from sentry import conf
 from sentry.helpers import transform
@@ -368,8 +368,6 @@ def testSignals(self):
         self.assertEquals(last.message, smart_unicode(exc))
 
     def testSignalsWithoutRequest(self):
-        request = RF.get("/", REMOTE_ADDR="127.0.0.1:8000")
-
         try:
             Message.objects.get(id=999999999)
         except Message.DoesNotExist, exc:
@@ -858,7 +856,6 @@ def tearDown(self):
         conf.CLIENT = self._client
 
     def test_get_client(self):
-        from sentry.client.base import SentryClient
         from sentry.client.log import LoggingSentryClient
         self.assertEquals(get_client().__class__, SentryClient)
         self.assertEquals(get_client(), get_client())
@@ -891,7 +888,6 @@ def emit(self, record):
         self.assertEquals(_foo[''].class_name, 'Exception')
 
     def test_celery_client(self):
-        from sentry.client.base import SentryClient
         from sentry.client.celery import CelerySentryClient
         self.assertEquals(get_client().__class__, SentryClient)
         self.assertEquals(get_client(), get_client())

sentry/urls.py

@@ -1,6 +1,5 @@
 import os
 
-from django.conf import settings
 from django.conf.urls.defaults import *
 
 from sentry.conf import KEY

sentry/views.py

@@ -4,19 +4,16 @@
 except ImportError:
     import pickle
 import datetime
-from math import log
 import logging
 import zlib
 
 from django.core.context_processors import csrf
 from django.core.urlresolvers import reverse
-from django.db.models import Count
 from django.http import HttpResponse, HttpResponseBadRequest, \
     HttpResponseForbidden, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template.loader import render_to_string
 from django.utils import simplejson
-from django.utils.datastructures import SortedDict
 from django.utils.safestring import mark_safe
 from django.views.decorators.csrf import csrf_protect, csrf_exempt
 
@@ -39,7 +36,7 @@ def get_filters():
             try:
                 module = __import__(module_name, {}, {}, class_name)
                 filter_ = getattr(module, class_name)
-            except Exception, exc:
+            except Exception:
                 logging.exception('Unable to import %s' % (filter_,))
                 continue
             if filter_.column.startswith('data__'):
@@ -62,7 +59,7 @@ def wrapped(request, *args, **kwargs):
 
 @csrf_protect
 def login(request):
-    from django.contrib.auth import authenticate, login as login_
+    from django.contrib.auth import login as login_
     from django.contrib.auth.forms import AuthenticationForm
 
     if request.POST:
@@ -297,9 +294,9 @@ def store(request):
     try:
         try:
             data = pickle.loads(base64.b64decode(data).decode('zlib'))
-        except zlib.error, e:
+        except zlib.error:
             data = pickle.loads(base64.b64decode(data))
-    except Exception, e:
+    except Exception:
         return HttpResponseForbidden('Bad data')
 
     GroupedMessage.objects.from_kwargs(**data)