Make kitsune flake8 compliant.

kitsune/announcements/forms.py

@@ -16,7 +16,8 @@ class AnnouncementForm(forms.Form):
     """
     content = forms.CharField(label=_lazy(u'Content'), max_length=10000,
                               widget=forms.Textarea)
-    show_after = forms.DateField(label=_lazy(u'Show after'), initial=date.today,
+    show_after = forms.DateField(label=_lazy(u'Show after'),
+                                 initial=date.today,
                                  input_formats=['%Y-%m-%d'])
     show_until = forms.DateField(label=_lazy(u'Show until'), required=False,
                                  input_formats=['%Y-%m-%d'])

kitsune/announcements/models.py

@@ -17,24 +17,24 @@ class Announcement(ModelBase):
         default=datetime.now, db_index=True,
         verbose_name='Start displaying',
         help_text=('When this announcement will start appearing. '
-                    '(US/Pacific)'))
+                   '(US/Pacific)'))
     show_until = models.DateTimeField(
         db_index=True, null=True, blank=True,
         verbose_name='Stop displaying',
         help_text=('When this announcement will stop appearing. '
-                    'Leave blank for indefinite. (US/Pacific)'))
+                   'Leave blank for indefinite. (US/Pacific)'))
     content = models.TextField(
         max_length=10000,
         help_text=("Use wiki syntax or HTML. It will display similar to a "
-                    "document's content."))
+                   "document's content."))
     group = models.ForeignKey(Group, null=True, blank=True)
     locale = models.ForeignKey(Locale, null=True, blank=True)
 
     def __unicode__(self):
         excerpt = self.content[:50]
         if self.group:
             return u'[{group}] {excerpt}'.format(group=self.group,
-                                                excerpt=excerpt)
+                                                 excerpt=excerpt)
         return u'{excerpt}'.format(excerpt=excerpt)
 
     def is_visible(self):

kitsune/announcements/tasks.py

@@ -1,15 +1,13 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
-from django.core.mail import EmailMultiAlternatives
 
 import bleach
 from celery.task import task
 from tower import ugettext as _
 
 from kitsune.announcements.models import Announcement
-from kitsune.sumo.email_utils import (
-    make_mail, render_email, safe_translation, send_messages)
+from kitsune.sumo.email_utils import make_mail, safe_translation, send_messages
 
 
 @task

kitsune/announcements/tests/test_views.py

@@ -62,9 +62,9 @@ def setUp(self):
         self.locale.leaders.add(self.u)
         self.locale.save()
 
-        self.announcement = announcement(save=True, creator=self.u,
-            locale=self.locale, content="Look at me!",
-            show_after=datetime(2012, 01, 01, 0, 0, 0))
+        self.announcement = announcement(
+            creator=self.u, locale=self.locale, content="Look at me!",
+            show_after=datetime(2012, 01, 01, 0, 0, 0), save=True)
 
     def _delete_test(self, id, status, count):
         """Login, or other setup, then call this."""

kitsune/announcements/urls.py

@@ -1,7 +1,8 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns('kitsune.announcements.views',
+urlpatterns = patterns(
+    'kitsune.announcements.views',
     url(r'^/create/locale$', 'create_for_locale',
         name='announcements.create_for_locale'),
     url(r'^/(?P<announcement_id>\d+)/delete$', 'delete',

kitsune/announcements/views.py

@@ -26,10 +26,10 @@ def create_for_locale(request):
         a = Announcement(creator=user, locale=locale, **form.cleaned_data)
         a.save()
         return HttpResponse(json.dumps({'id': a.id}),
-            content_type="application/json")
+                            content_type="application/json")
     else:
         return HttpResponse(json.dumps(form.errors), status=400,
-            content_type="application/json")
+                            content_type="application/json")
 
 
 @require_POST

kitsune/customercare/admin.py

@@ -16,7 +16,7 @@ class TweetAdmin(admin.ModelAdmin):
 class ReplyAdmin(admin.ModelAdmin):
     date_hierarchy = 'created'
     list_display = ('tweet_id', 'user', 'twitter_username', '__unicode__',
-    				'created', 'locale')
+                    'created', 'locale')
     list_filter = ('locale', 'twitter_username')
     search_fields = ('raw_json',)
     raw_id_fields = ('user',)

kitsune/customercare/cron.py

@@ -202,7 +202,7 @@ def get_customercare_stats():
         raw = json.loads(reply.raw_json)
         user = reply.twitter_username
         if user not in contributor_stats:
-            if 'from_user' in raw: #For tweets collected using v1 API
+            if 'from_user' in raw:  # For tweets collected using v1 API
                 user_data = raw
             else:
                 user_data = raw['user']
@@ -227,7 +227,8 @@ def get_customercare_stats():
     limit = settings.CC_TOP_CONTRIB_LIMIT
     # Sort by whatever is in settings, break ties with 'all'
     contributor_stats = sorted(contributor_stats.values(),
-        key=lambda c: (c[sort_key], c['all']), reverse=True)[:limit]
+                               key=lambda c: (c[sort_key], c['all']),
+                               reverse=True)[:limit]
 
     try:
         redis = redis_client(name='default')

kitsune/customercare/helpers.py

@@ -32,8 +32,9 @@ def round_percent(num):
     """Return a customercare-format percentage from a number."""
     return round(num, 1) if num < 10 else int(round(num, 0))
 
+
 @register.filter
 def max(num, limit):
     if num > limit:
         num = limit
-    return num
+    return num

kitsune/customercare/models.py

@@ -43,7 +43,8 @@ class Reply(ModelBase):
     The Tweet table gets truncated regularly so we can't use it for metrics.
     This model is to keep track of contributor counts and such.
     """
-    user = models.ForeignKey(User, null=True, blank=True, related_name='tweet_replies')
+    user = models.ForeignKey(User, null=True, blank=True,
+                             related_name='tweet_replies')
     twitter_username = models.CharField(max_length=20)
     tweet_id = models.BigIntegerField()
     raw_json = models.TextField()

kitsune/customercare/tests/__init__.py

@@ -68,7 +68,7 @@ def reply(**kwargs):
             'text': kwargs.pop('text', 'Hey #Firefox'),
             'created_at': 'Thu, 23 Sep 2010 13:58:06 +0000',
             'source': '<a href="http://www.tweetdeck.com" '
-                'rel="nofollow">TweetDeck</a>',
+                      'rel="nofollow">TweetDeck</a>',
             'user': {
                 'screen_name': '__jimcasey__',
                 'profile_image_url': 'http://a1.twimg.com/profile_images/'

kitsune/customercare/tests/test_cron.py

@@ -18,7 +18,6 @@
 from kitsune.sumo.tests import TestCase
 
 
-
 class TwitterCronTestCase(TestCase):
     tweet_template = {
         "profile_image_url": (

kitsune/customercare/tests/test_templates.py

@@ -125,7 +125,7 @@ def test_fallback_message(self):
         eq_(200, r.status_code)
         doc = pq(r.content)
         assert doc('#tweets-wrap .warning-box'), (
-               'Fallback message is not showing up.')
+            'Fallback message is not showing up.')
 
 
 class StatsTests(TestCase):

kitsune/customercare/tests/test_views.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta
 import json
-import time
 
 from django.conf import settings
 

kitsune/customercare/urls.py

@@ -1,7 +1,8 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns('kitsune.customercare.views',
+urlpatterns = patterns(
+    'kitsune.customercare.views',
     url(r'^/more_tweets$', 'more_tweets', name="customercare.more_tweets"),
     url(r'^/twitter_post$', 'twitter_post', name="customercare.twitter_post"),
     url(r'^/hide_tweet$', 'hide_tweet', name="customercare.hide_tweet"),

kitsune/customercare/views.py

@@ -1,8 +1,7 @@
-import calendar
 import json
 import logging
 from datetime import datetime, timedelta
-from email.utils import parsedate, formatdate
+from email.utils import parsedate
 
 from django.conf import settings
 from django.http import (HttpResponse, HttpResponseBadRequest,
@@ -46,7 +45,7 @@ def _tweet_for_template(tweet, https=False):
     else:
         replies = None
 
-    if 'from_user' in data: #For tweets collected using v1 API
+    if 'from_user' in data:  # For tweets collected using v1 API
         user_data = data
         from_user = data['from_user']
     else:
@@ -242,10 +241,10 @@ def twitter_post(request):
     # replying to a deleted tweet. TODO: Catch integrity error and log or
     # something.
     tweet = Tweet.objects.create(pk=status['id'],
-                         raw_json=json.dumps(raw_tweet_data),
-                         locale=author['lang'],
-                         created=created_at,
-                         reply_to_id=reply_to_id)
+                                 raw_json=json.dumps(raw_tweet_data),
+                                 locale=author['lang'],
+                                 created=created_at,
+                                 reply_to_id=reply_to_id)
 
     # Record in our Reply table.
     Reply.objects.create(
@@ -287,7 +286,7 @@ def hide_tweet(request):
         return HttpResponseNotFound(_('Invalid ID.'))
 
     if (tweet.reply_to is not None or
-        Tweet.objects.filter(reply_to=tweet).exists()):
+            Tweet.objects.filter(reply_to=tweet).exists()):
         return HttpResponseBadRequest(_('Tweets that are replies or have '
                                         'replies must not be hidden.'))
 

kitsune/dashboards/cron.py

@@ -63,7 +63,7 @@ def update_l10n_coverage_metrics():
             # % of all articles
             all_ = rows['all']
             try:
-                percent = 100.0 * float(all_['numerator']) / all_['denominator']
+                percent = 100 * float(all_['numerator']) / all_['denominator']
             except ZeroDivisionError:
                 percent = 0.0
 
@@ -253,10 +253,10 @@ def _bayes_avg(C, m, R, v):
     for entry in sorted_final:
         doc = Document.objects.get(pk=entry[0])
         redis.rpush(REDIS_KEY, (u'%s::%s::%s::%s::%s::%s::%s' %
-                                  (entry[0],  # Document ID
-                                   entry[1],  # Total Votes
-                                   entry[2],  # Current Percentage
-                                   entry[3],  # Difference in Percentage
-                                   1 - (entry[1] / max_total),  # Graph Color
-                                   doc.slug,  # Document slug
-                                   doc.title)))  # Document title
+                                (entry[0],  # Document ID
+                                 entry[1],  # Total Votes
+                                 entry[2],  # Current Percentage
+                                 entry[3],  # Difference in Percentage
+                                 1 - (entry[1] / max_total),  # Graph Color
+                                 doc.slug,  # Document slug
+                                 doc.title)))  # Document title