Added flake8.cfg and cleaned up code.

accounts/forms.py

@@ -1,9 +1,8 @@
-from __future__ import absolute_import
-
 from django import forms
 
 from .models import Profile
 
+
 class ProfileForm(forms.ModelForm):
     """
     A form for editing user profiles.

accounts/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+
 class Profile(models.Model):
     user = models.OneToOneField(User)
     name = models.CharField(max_length=200, blank=True)

accounts/views.py

@@ -1,7 +1,6 @@
-from __future__ import absolute_import
-
 import hashlib
 import json
+
 from django.shortcuts import redirect, render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -15,6 +14,7 @@
 from .forms import ProfileForm
 from .models import Profile
 
+
 def user_profile(request, username):
     u = get_object_or_404(User, username=username)
     ctx = {
@@ -26,6 +26,7 @@ def user_profile(request, username):
     }
     return render(request, "accounts/user_profile.html", ctx)
 
+
 @login_required
 def edit_profile(request):
     profile, created = Profile.objects.get_or_create(user=request.user)
@@ -35,6 +36,7 @@ def edit_profile(request):
         return redirect('user_profile', request.user.username)
     return render(request, "accounts/edit_profile.html", {'form': form})
 
+
 def json_user_info(request):
     """
     Return info about some users as a JSON object.
@@ -51,12 +53,13 @@ def json_user_info(request):
     De-duplication on GET['user'] is performed since I don't want to have to
     think about how best to do it in JavaScript :)
     """
-
     userinfo = dict([
-                (name, get_user_info(name))
-                for name in set(request.GET.getlist('user'))])
+        (name, get_user_info(name))
+        for name in set(request.GET.getlist('user'))
+    ])
     return JSONResponse(userinfo)
 
+
 def get_user_info(username):
     c = cache.get_cache('default')
     username = username.encode('ascii', 'ignore')
@@ -75,6 +78,7 @@ def get_user_info(username):
         c.set(key, info, 60*60)
     return info
 
+
 def get_user_stats(user):
     c = cache.get_cache('default')
     key = 'user_vital_status:%s' % hashlib.md5(user.username).hexdigest()
@@ -89,6 +93,7 @@ def get_user_stats(user):
         c.set(key, info, 60*60)
     return info
 
+
 class JSONResponse(HttpResponse):
     def __init__(self, obj):
         super(JSONResponse, self).__init__(

aggregator/admin.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import
-
 from django.contrib import admin
+
 from .models import Feed, FeedItem, FeedType, APPROVED_FEED, DENIED_FEED
 
 
@@ -18,7 +17,8 @@ def mark_denied(modeladmin, request, queryset):
 mark_denied.short_description = "Mark selected feeds as denied."
 
 
-admin.site.register(Feed,
+admin.site.register(
+    Feed,
     list_display=["title", "feed_type", "public_url", "approval_status"],
     list_filter=["feed_type", "approval_status"],
     ordering=["title"],
@@ -29,13 +29,15 @@ def mark_denied(modeladmin, request, queryset):
     actions=[mark_approved, mark_denied],
 )
 
-admin.site.register(FeedItem,
+admin.site.register(
+    FeedItem,
     list_display=['title', 'feed', 'date_modified'],
     list_filter=['feed'],
     search_fields=['feed__title', 'feed__public_url', 'title'],
     date_heirarchy=['date_modified'],
 )
 
-admin.site.register(FeedType,
+admin.site.register(
+    FeedType,
     prepopulated_fields={'slug': ('name',)},
 )

aggregator/feeds.py

@@ -1,10 +1,10 @@
-from __future__ import absolute_import
-
 from django.core import urlresolvers
 from django.contrib.syndication.views import Feed
 from django.shortcuts import get_object_or_404
+
 from .models import FeedType, FeedItem
 
+
 class BaseCommunityAggregatorFeed(Feed):
     def item_title(self, item):
         return item.title
@@ -27,6 +27,7 @@ def item_author_link(self, item):
     def item_pubdate(self, item):
         return item.date_modified
 
+
 class CommunityAggregatorFeed(BaseCommunityAggregatorFeed):
     def get_object(self, request, slug=None):
         return get_object_or_404(FeedType, slug=slug)
@@ -46,6 +47,7 @@ def link(self, obj):
     def description(self, obj):
         return self.title(obj)
 
+
 class CommunityAggregatorFirehoseFeed(BaseCommunityAggregatorFeed):
     title = 'Django community aggregator firehose'
     description = 'All activity from the Django community aggregator'
@@ -55,4 +57,4 @@ def link(self):
 
     def items(self):
         qs = FeedItem.objects.order_by('-date_modified').select_related('feed')
-        return qs[:50]
+        return qs[:50]

aggregator/forms.py

@@ -1,8 +1,8 @@
-from __future__ import absolute_import
-
 from django import forms
+
 from .models import Feed
 
+
 class FeedModelForm(forms.ModelForm):
     title = forms.CharField(max_length=250,
                             help_text="title of the resource / blog.")

aggregator/management/commands/send_pending_approval_email.py

@@ -2,15 +2,15 @@
 Send an email to settings.FEED_APPROVERS with the feeds that need to
 be manually approved.
 """
-from __future__ import absolute_import
-
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core import mail
 from django.core.management.base import NoArgsCommand
 from django.template import Context, Template
+
 from ...models import Feed, PENDING_FEED
 
+
 class Command(NoArgsCommand):
 
     def handle_noargs(self, **kwargs):

aggregator/models.py

@@ -21,9 +21,9 @@ def __unicode__(self):
     def items(self):
         return FeedItem.objects.filter(feed__feed_type=self)
 
-APPROVED_FEED='A'
-DENIED_FEED='D'
-PENDING_FEED='P'
+APPROVED_FEED = 'A'
+DENIED_FEED = 'D'
+PENDING_FEED = 'P'
 
 STATUS_CHOICES = (
     (PENDING_FEED, 'Pending'),
@@ -93,12 +93,13 @@ def create_or_update_by_guid(self, guid, **kwargs):
             # Don't update the date since most feeds get this wrong.
             kwargs.pop('date_modified')
 
-            for k,v in kwargs.items():
+            for k, v in kwargs.items():
                 setattr(item, k, v)
             item.save()
 
         return item
 
+
 class FeedItem(models.Model):
     feed = models.ForeignKey(Feed)
     title = models.CharField(max_length=500)
@@ -160,12 +161,13 @@ def feed_updated(sender, notification, **kwargs):
         else:
             date_modified = datetime.datetime.now()
 
-        FeedItem.objects.create_or_update_by_guid(guid,
-            feed = feed,
-            title = title,
-            link = link,
-            summary = content,
-            date_modified = date_modified
+        FeedItem.objects.create_or_update_by_guid(
+            guid,
+            feed=feed,
+            title=title,
+            link=link,
+            summary=content,
+            date_modified=date_modified,
         )
 
 push_signals.updated.connect(feed_updated)

aggregator/tests.py

@@ -1,20 +1,17 @@
-# email test
-# https://docs.djangoproject.com/en/dev/topics/testing/#email-services
-from __future__ import absolute_import
-
 import datetime
+
 from django.conf import settings
 from django.contrib.auth.models import Group, User
 from django.core import mail
 from django.core.urlresolvers import reverse
 from django.test import TestCase
-from django.test.client import Client
 
 from docs.models import DocumentRelease
 
 from .management.commands import send_pending_approval_email
 from . import models
 
+
 class AggregatorTests(TestCase):
 
     def setUp(self):
@@ -26,27 +23,29 @@ def setUp(self):
         self.user = User.objects.create(username="Mr. Potato", email="mr@potato.com")
         self.user.groups.add(g)
 
-
-        self.feed_type = models.FeedType(name="Test Feed Type", slug="test-feed-type", can_self_add=True)
-        self.feed_type.save()
-
-        self.approved_feed = models.Feed(title="Approved", feed_url="foo.com/rss/", public_url="foo.com/",
-                             approval_status=models.APPROVED_FEED, feed_type=self.feed_type)
-        self.denied_feed = models.Feed(title="Denied", feed_url="bar.com/rss/", public_url="bar.com/",
-                             approval_status=models.DENIED_FEED, feed_type=self.feed_type)
-        self.pending_feed = models.Feed(title="Pending", feed_url="baz.com/rss/", public_url="baz.com/",
-                             approval_status=models.PENDING_FEED, feed_type=self.feed_type)
+        self.feed_type = models.FeedType.objects.create(name="Test Feed Type", slug="test-feed-type", can_self_add=True)
+
+        self.approved_feed = models.Feed.objects.create(
+            title="Approved", feed_url="foo.com/rss/", public_url="foo.com/",
+            approval_status=models.APPROVED_FEED, feed_type=self.feed_type,
+        )
+        self.denied_feed = models.Feed.objects.create(
+            title="Denied", feed_url="bar.com/rss/", public_url="bar.com/",
+            approval_status=models.DENIED_FEED, feed_type=self.feed_type,
+        )
+        self.pending_feed = models.Feed.objects.create(
+            title="Pending", feed_url="baz.com/rss/", public_url="baz.com/",
+            approval_status=models.PENDING_FEED, feed_type=self.feed_type,
+        )
 
         for feed in [self.approved_feed, self.denied_feed, self.pending_feed]:
-            feed.save()
-            feed_item = models.FeedItem(feed=feed, title="%s Item" % feed.title, link=feed.public_url,
-                                 date_modified=datetime.datetime.now(), guid=feed.title)
-            feed_item.save()
-
-        self.client = Client()
+            models.FeedItem.objects.create(
+                feed=feed, title="%s Item" % feed.title, link=feed.public_url,
+                date_modified=datetime.datetime.now(), guid=feed.title,
+            )
 
     def test_feed_list_only_approved_and_active(self):
-        response = self.client.get(reverse('community-feed-list', kwargs={'feed_type_slug': self.feed_type.slug}));
+        response = self.client.get(reverse('community-feed-list', kwargs={'feed_type_slug': self.feed_type.slug}))
         for item in response.context['object_list']:
             self.assertEqual(models.APPROVED_FEED, item.feed.approval_status)
 

aggregator/urls.py

@@ -2,12 +2,15 @@
 
 from . import views
 
+
 urlpatterns = [
-    url(r'^$',
+    url(
+        r'^$',
         views.index,
         name='community-index'
     ),
-    url(r'^mine/$',
+    url(
+        r'^mine/$',
         views.my_feeds,
         name='community-my-feeds'
     ),

aggregator/utils.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 
+
 def push_credentials(hub_url):
     """
     Callback for django_push to get a hub's credentials.

aggregator/views.py

@@ -1,13 +1,12 @@
-from __future__ import absolute_import
-
-from django.shortcuts import render, get_object_or_404, redirect
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, get_object_or_404, redirect
 from django.views.generic.list import ListView
 
 from .models import FeedItem, Feed, FeedType, APPROVED_FEED
 from .forms import FeedModelForm
 
+
 def index(request):
     """
     Displays the latest feeds of each type.
@@ -18,6 +17,7 @@ def index(request):
     ctx = {'feedtype_list': feeds}
     return render(request, 'aggregator/index.html', ctx)
 
+
 class FeedListView(ListView):
     """
     Shows the latest feeds for the given type.
@@ -34,6 +34,7 @@ def get_context_data(self, **kwargs):
         context['feed_type'] = self.feed_type
         return context
 
+
 @login_required
 def my_feeds(request):
     """
@@ -49,6 +50,7 @@ def my_feeds(request):
     }
     return render(request, 'aggregator/my-feeds.html', ctx)
 
+
 @login_required
 def add_feed(request, feed_type_slug):
     """
@@ -71,6 +73,7 @@ def add_feed(request, feed_type_slug):
     ctx = {'form': f, 'feed_type': ft, 'adding': True}
     return render(request, 'aggregator/edit-feed.html', ctx)
 
+
 @login_required
 def edit_feed(request, feed_id):
     """
@@ -87,6 +90,7 @@ def edit_feed(request, feed_id):
     ctx = {'form': f, 'feed': feed, 'adding': False}
     return render(request, 'aggregator/edit-feed.html', ctx)
 
+
 @login_required
 def delete_feed(request, feed_id):
     """