github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move SITEURL check for feed generation from generators.py to settings.py

Browse source
This commit is contained in:
jawher 2012-11-07 20:52:59 +01:00 • committed by Bruno Binet
commit 1b81f8b830
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pelican/generators.py
View file

@ -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,

12
pelican/settings.py
View file

@ -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"