From 1b81f8b830a5637fa51aedc2e35b2fb5aed4bf3e Mon Sep 17 00:00:00 2001 From: jawher Date: Wed, 7 Nov 2012 20:52:59 +0100 Subject: [PATCH] Move SITEURL check for feed generation from generators.py to settings.py --- pelican/generators.py | 4 ---- pelican/settings.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index fc59c905..77989df9 100644 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -156,10 +156,6 @@ class ArticlesGenerator(Generator): def generate_feeds(self, writer): """Generate the feeds from the current context, and output files.""" - if self.settings.get('SITEURL') is '': - logger.warning( - 'Feeds generated without SITEURL set properly may not be valid' - ) if self.settings.get('FEED_ATOM'): writer.write_feed(self.articles, self.context, diff --git a/pelican/settings.py b/pelican/settings.py index d667c95f..d1532bc7 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -182,10 +182,14 @@ def configure_settings(settings): 'TRANSLATION_FEED_ATOM', 'TRANSLATION_FEED_RSS', ] - if not settings.get('FEED_DOMAIN') and any(settings.get(k) for k in feed_keys): - logger.warn("Since feed URLs should always be absolute, you should specify " - "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = " - "http://www.example.com')") + if any(settings.get(k) for k in feed_keys): + if not settings.get('FEED_DOMAIN'): + logger.warn("Since feed URLs should always be absolute, you should specify " + "FEED_DOMAIN in your settings. (e.g., 'FEED_DOMAIN = " + "http://www.example.com')") + + if not settings.get('SITEURL'): + logger.warn("Feeds generated without SITEURL set properly may not be valid") if not 'TIMEZONE' in settings: logger.warn("No timezone information specified in the settings. Assuming"