From 0856b72c3cc97f46bd71a5963a00c8d4e5f8a85d Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Mon, 22 Oct 2012 23:05:18 +0200 Subject: [PATCH] cosmetics lines should be < 80 chars --- pelican/__init__.py | 4 ++-- pelican/generators.py | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pelican/__init__.py b/pelican/__init__.py index 2f37b17a..9809b19b 100644 --- a/pelican/__init__.py +++ b/pelican/__init__.py @@ -124,8 +124,8 @@ class Pelican(object): if self.settings.get('TRANSLATION_FEED', False): logger.warning('Found deprecated `TRANSLATION_FEED` in settings. ' - 'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your settings and ' - 'theme for the same behavior. Temporarily setting ' + 'Modify TRANSLATION_FEED to TRANSLATION_FEED_ATOM in your ' + 'settings and theme for the same behavior. Temporarily setting ' 'TRANSLATION_FEED_ATOM for backwards compatibility.') self.settings['TRANSLATION_FEED_ATOM'] =\ self.settings['TRANSLATION_FEED'] diff --git a/pelican/generators.py b/pelican/generators.py index 3d298630..24bf76a1 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -128,7 +128,8 @@ class ArticlesGenerator(Generator): def generate_feeds(self, writer): """Generate the feeds from the current context, and output files.""" - if self.settings.get('FEED_ATOM') is None and self.settings.get('FEED_RSS') is None: + if self.settings.get('FEED_ATOM') is None \ + and self.settings.get('FEED_RSS') is None: return elif self.settings.get('SITEURL') is '': logger.warning( @@ -154,7 +155,8 @@ class ArticlesGenerator(Generator): self.settings['CATEGORY_FEED_RSS'] % cat, feed_type='rss') - if self.settings.get('TAG_FEED_ATOM') or self.settings.get('TAG_FEED_RSS'): + if self.settings.get('TAG_FEED_ATOM') \ + or self.settings.get('TAG_FEED_RSS'): for tag, arts in self.tags.items(): arts.sort(key=attrgetter('date'), reverse=True) if self.settings.get('TAG_FEED_ATOM'): @@ -166,7 +168,8 @@ class ArticlesGenerator(Generator): self.settings['TAG_FEED_RSS'] % tag, feed_type='rss') - if self.settings.get('TRANSLATION_FEED_ATOM') or self.settings.get('TRANSLATION_FEED_RSS'): + if self.settings.get('TRANSLATION_FEED_ATOM') or \ + self.settings.get('TRANSLATION_FEED_RSS'): translations_feeds = defaultdict(list) for article in chain(self.articles, self.translations): translations_feeds[article.lang].append(article) @@ -175,11 +178,11 @@ class ArticlesGenerator(Generator): items.sort(key=attrgetter('date'), reverse=True) if self.settings.get('TRANSLATION_FEED_ATOM'): writer.write_feed(items, self.context, - self.settings['TRANSLATION_FEED_ATOM'] % lang) + self.settings['TRANSLATION_FEED_ATOM'] % lang) if self.settings.get('TRANSLATION_FEED_RSS'): writer.write_feed(items, self.context, - self.settings['TRANSLATION_FEED_RSS'] % lang, - feed_type='rss') + self.settings['TRANSLATION_FEED_RSS'] % lang, + feed_type='rss') def generate_articles(self, write): """Generate the articles."""