diff --git a/conservancy/feeds.py b/conservancy/feeds.py index 562ab3d0a6060605ba7b0c22ec86a87af01b2167..a562537f19f2730437d17808e9b75ca082e80fb6 100644 --- a/conservancy/feeds.py +++ b/conservancy/feeds.py @@ -13,9 +13,11 @@ from .news.models import PressRelease class ConservancyFeedBase(Feed): - def copyright_holder(self): return "Software Freedom Conservancy" + def copyright_holder(self): + return "Software Freedom Conservancy" - def license_no_html(self): return "Licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License." + def license_no_html(self): + return "Licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License." def item_copyright(self, item): year = 2008 @@ -89,7 +91,8 @@ class OmnibusFeed(ConservancyFeedBase): def item_description(self, item): return item.summary - def item_enclosure_mime_type(self): return "audio/mpeg" + def item_enclosure_mime_type(self): + return "audio/mpeg" def item_enclosure_url(self, item): if hasattr(item, 'mp3_path'): @@ -98,9 +101,6 @@ class OmnibusFeed(ConservancyFeedBase): if hasattr(item, 'mp3_path'): return item.mp3_length - def item_pubdate(self, item): - return item.pub_date - def item_author_name(self, item): if item.omnibus_type == "blog": return item.author.formal_name @@ -174,7 +174,8 @@ class BlogFeed(ConservancyFeedBase): firstTime = True done = {} for tag in tags: - if tag in done: continue + if tag in done: + continue if firstTime: answer += " (" firstTime = False @@ -192,8 +193,10 @@ class BlogFeed(ConservancyFeedBase): GET = obj.GET tags = [] - if 'author' in GET: tags = GET.getlist('author') - if 'tag' in GET: tags += GET.getlist('tag') + if 'author' in GET: + tags = GET.getlist('author') + if 'tag' in GET: + tags += GET.getlist('tag') done = {} if len(tags) == 1: @@ -201,7 +204,8 @@ class BlogFeed(ConservancyFeedBase): elif len(tags) > 1: firstTime = True for tag in tags: - if tag in done: continue + if tag in done: + continue if firstTime: answer += " tagged with " firstTime = False