From 05e0a331cfcad07eb6edafd20b2dd9d36d77a4cf Mon Sep 17 00:00:00 2001
From: Will Kahn-Greene <willkg@mozilla.com>
Date: Tue, 12 Aug 2014 14:29:30 -0400
Subject: [PATCH] [bug 1015788] Cosmetic: flake8 fixes (feedback)

---
 fjord/feedback/api_views.py |  1 +
 fjord/feedback/forms.py     |  6 ++----
 fjord/feedback/models.py    | 17 +++++++++++------
 fjord/feedback/utils.py     |  6 ------
 fjord/feedback/views.py     |  5 ++---
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/fjord/feedback/api_views.py b/fjord/feedback/api_views.py
index a7e66fde..9c03cf0d 100644
--- a/fjord/feedback/api_views.py
+++ b/fjord/feedback/api_views.py
@@ -102,6 +102,7 @@ def get_throttles(self):
                 methods=('GET',))
         ]
 
+
 class PostFeedbackAPI(rest_framework.generics.CreateAPIView):
     serializer_class = models.PostResponseSerializer
 
diff --git a/fjord/feedback/forms.py b/fjord/feedback/forms.py
index e60cfa35..76073d61 100644
--- a/fjord/feedback/forms.py
+++ b/fjord/feedback/forms.py
@@ -1,7 +1,5 @@
 from django import forms
 
-from tower import ugettext as _
-
 
 class URLInput(forms.TextInput):
     """Text field with HTML5 URL Input type."""
@@ -27,6 +25,6 @@ class ResponseForm(forms.Form):
     # These are hidden fields on the form which we have here so we can
     # abuse the fields for data validation.
     manufacturer = forms.CharField(required=False, widget=forms.HiddenInput(
-            attrs={'class': 'manufacturer'}))
+        attrs={'class': 'manufacturer'}))
     device = forms.CharField(required=False, widget=forms.HiddenInput(
-            attrs={'class': 'device'}))
+        attrs={'class': 'device'}))
diff --git a/fjord/feedback/models.py b/fjord/feedback/models.py
index fa679ea9..7ea6ea85 100644
--- a/fjord/feedback/models.py
+++ b/fjord/feedback/models.py
@@ -366,7 +366,6 @@ def public_fields(cls):
             'created'
         )
 
-
     @classmethod
     def get_mapping(cls):
         return {
@@ -491,10 +490,15 @@ def morelikethis(cls, resp):
         else:
             min_term_freq = 1
 
-        return MLT(id_=resp.id, s = s, mlt_fields=['description'],
-                   index=cls.get_index(), doctype=cls.get_mapping_type_name(),
-                   stop_words=list(ANALYSIS_STOPWORDS),
-                   min_term_freq=min_term_freq)
+        return MLT(
+            id_=resp.id,
+            s=s,
+            mlt_fields=['description'],
+            index=cls.get_index(),
+            doctype=cls.get_mapping_type_name(),
+            stop_words=list(ANALYSIS_STOPWORDS),
+            min_term_freq=min_term_freq
+        )
 
 
 class ResponseEmail(ModelBase):
@@ -541,7 +545,8 @@ class PostResponseSerializer(serializers.Serializer):
     url = serializers.URLField(required=False, default=u'')
     description = serializers.CharField(required=True)
 
-    category = serializers.CharField(max_length=50, required=False, default=u'')
+    category = serializers.CharField(max_length=50, required=False,
+                                     default=u'')
 
     # product, channel, version, locale, platform
     product = NoNullsCharField(max_length=20, required=True)
diff --git a/fjord/feedback/utils.py b/fjord/feedback/utils.py
index 462873d1..121ba5d0 100644
--- a/fjord/feedback/utils.py
+++ b/fjord/feedback/utils.py
@@ -1,13 +1,7 @@
-from hashlib import md5
 import re
 import urlparse
 
-from elasticsearch.exceptions import ElasticsearchException
-
-from django.utils.encoding import force_str
-
 from fjord.feedback import config
-from fjord.search.index import es_analyze
 
 
 TOKEN_SPLIT_RE = re.compile(r'[\s\.\,\/\\\?\;\:\"\*\&\^\%\$\#\@\!]+')
diff --git a/fjord/feedback/views.py b/fjord/feedback/views.py
index 3848fda7..a5221e80 100644
--- a/fjord/feedback/views.py
+++ b/fjord/feedback/views.py
@@ -338,7 +338,7 @@ def android_about_feedback(request, locale=None):
 @csrf_exempt
 @never_cache
 def feedback_router_dev(request, product=None, version=None, channel=None,
-                    *args, **kwargs):
+                        *args, **kwargs):
     """DEV ONLY FEEDBACK ROUTER"""
     view = None
 
@@ -392,7 +392,7 @@ def feedback_router_dev(request, product=None, version=None, channel=None,
         })
 
     view = view or generic_feedback_dev
-        
+
     return view(request, request.locale, product, version, channel,
                 *args, **kwargs)
 
@@ -443,7 +443,6 @@ def feedback_router(request, product=None, version=None, channel=None,
 
         return android_about_feedback(request, request.locale)
 
-
     # FIXME - validate these better
     version = smart_str(version)
     channel = smart_str(channel).lower()