Tiny code cleanup

4 files changed, 18 insertions, 14 deletions

diff --git a/ryuslash/aggregator/feeds.py b/ryuslash/aggregator/feeds.py
index 75e5d4f..7b84138 100644
--- a/ryuslash/aggregator/feeds.py
+++ b/ryuslash/aggregator/feeds.py
@@ -1,6 +1,7 @@
 from django.contrib.syndication.views import Feed
 
-from .models import Post
+from aggregator.models import Post
+
 
 class LatestPostsFeed(Feed):
     title = "ryuslash's RSS feed"
diff --git a/ryuslash/aggregator/management/commands/loadfeeds.py b/ryuslash/aggregator/management/commands/loadfeeds.py
index 5663653..035e2ef 100644
--- a/ryuslash/aggregator/management/commands/loadfeeds.py
+++ b/ryuslash/aggregator/management/commands/loadfeeds.py
@@ -1,14 +1,15 @@
-import feedparser
 import datetime
+import feedparser
 import markdown
-import re
 import os
+import re
 import urllib2
 
+from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from aggregator.models import Post
-import settings
+
 
 class Command(BaseCommand):
     help = "Load data from saved feeds."
@@ -26,8 +27,8 @@ class Command(BaseCommand):
     def get_logopath(self, feedname, options):
         ext = self.get_ext(options)
         filename = self.prep_feedname(feedname) + '.' + ext
-        basedir = os.path.dirname(os.path.abspath(settings.__file__))
-        return os.path.join(basedir, 'static/images/logos', filename)
+        basedir = settings.STATICFILES_DIRS[0]
+        return os.path.join(basedir, 'images/logos', filename)
 
     def have_logo(self, feedname, options):
         logopath = self.get_logopath(feedname, options)
@@ -55,8 +56,8 @@ class Command(BaseCommand):
         for feedname, feedoptions in settings.FEEDS.iteritems():
             parsed = \
                 feedparser.parse(self.construct_feed_url(feedoptions))
-            icon = self.prep_feedname(feedname) + '.' \
-                   + self.get_ext(feedoptions)
+            icon = (self.prep_feedname(feedname) + '.' +
+                    self.get_ext(feedoptions))
             newcount = 0
 
             if not self.have_logo(feedname, feedoptions):
@@ -66,8 +67,7 @@ class Command(BaseCommand):
                 if Post.objects.filter(post_id=entry.id).exists():
                     continue
 
-                dt = entry.updated_parsed \
-                     or entry.published_parsed
+                dt = entry.updated_parsed or entry.published_parsed
 
                 if dt:
                     updated = datetime.datetime(
diff --git a/ryuslash/aggregator/templatetags/posts_extras.py b/ryuslash/aggregator/templatetags/posts_extras.py
index 64718a2..ae68483 100644
--- a/ryuslash/aggregator/templatetags/posts_extras.py
+++ b/ryuslash/aggregator/templatetags/posts_extras.py
@@ -5,10 +5,12 @@ from django.template.defaultfilters import stringfilter
 
 register = template.Library()
 
+
 @stringfilter
 def nameless(value):
     return re.sub(r'(^|by[- ])(ryuslash|tom)[- ]?', '', value)
 
+
 @stringfilter
 def truncate(value, length):
     if len(value) > length:
diff --git a/ryuslash/aggregator/views.py b/ryuslash/aggregator/views.py
index bb3c1b7..80eaadd 100644
--- a/ryuslash/aggregator/views.py
+++ b/ryuslash/aggregator/views.py
@@ -2,14 +2,15 @@ from django.core.paginator import Paginator, InvalidPage, EmptyPage
 from django.http import Http404
 from django.shortcuts import render
 
-from .models import Post
+from aggregator.models import Post
+
 
 def posts(request, cat, page=1):
     category = cat or 'post'
     queryset = Post.objects.filter(category=category)
     paginator = Paginator(queryset, 20)
 
-    if page == None:
+    if page is None:
         page = 1
 
     try:
@@ -18,5 +19,5 @@ def posts(request, cat, page=1):
         raise Http404
 
     return render(request, 'aggregator/posts.html',
-                  { 'list': object_list,
-                    'category': category })
+                  {'list': object_list,
+                   'category': category})