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

Warn on old format settings

Browse source 
rather than trying to update them in place. Relies on the user to make the needed changes. Fallback is the default setting.
This commit is contained in:
MinchinWeb 2018-10-12 19:35:43 -06:00
commit a3c0360be2
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
pelican/generators.py
View file

@ -342,8 +342,7 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_ATOM'].replace('%s', '{slug}')
.format(slug=cat.slug),
self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_ATOM_URL',
self.settings['CATEGORY_FEED_ATOM']).format(
@ -356,8 +355,7 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_RSS'].replace('%s', '{slug}')
.format(slug=cat.slug),
self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_RSS_URL',
self.settings['CATEGORY_FEED_RSS']).format(
@ -372,12 +370,11 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_ATOM'].replace('%s', '{slug}')
.format(slug=auth.slug),
self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_ATOM_URL',
self.settings['AUTHOR_FEED_ATOM']
).replace('%s', '{slug}').format(slug=auth.slug),
).format(slug=auth.slug),
feed_title=auth.name
)
@ -385,12 +382,11 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_RSS'].replace('%s', '{slug}')
.format(slug=auth.slug),
self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_RSS_URL',
self.settings['AUTHOR_FEED_RSS']
).replace('%s', '{slug}').format(slug=auth.slug),
).format(slug=auth.slug),
feed_title=auth.name,
feed_type='rss'
)
@ -402,12 +398,11 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_ATOM'].replace('%s', '{slug}')
.format(slug=tag.slug),
self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
self.settings.get(
'TAG_FEED_ATOM_URL',
self.settings['TAG_FEED_ATOM']
).replace('%s', '{slug}').format(slug=tag.slug),
).format(slug=tag.slug),
feed_title=tag.name
)
@ -415,12 +410,11 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_RSS'].replace('%s', '{slug}')
.format(slug=tag.slug),
self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
self.settings.get(
'TAG_FEED_RSS_URL',
self.settings['TAG_FEED_RSS']
).replace('%s', '{slug}').format(slug=tag.slug),
).format(slug=tag.slug),
feed_title=tag.name,
feed_type='rss'
)
@ -439,22 +433,22 @@ class ArticlesGenerator(CachingGenerator):
items,
self.context,
self.settings['TRANSLATION_FEED_ATOM']
.replace('%s', '{lang}').format(lang=lang),
.format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_ATOM_URL',
self.settings['TRANSLATION_FEED_ATOM']
).replace('%s', '{lang}').format(lang=lang),
).format(lang=lang),
)
if self.settings.get('TRANSLATION_FEED_RSS'):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_RSS']
.replace('%s', '{lang}').format(lang=lang),
.format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_RSS_URL',
self.settings['TRANSLATION_FEED_RSS']
).replace('%s', '{lang}').format(lang=lang),
).format(lang=lang),
feed_type='rss'
)

18
pelican/settings.py
View file

@ -185,6 +185,24 @@ def read_settings(path=None, override=None):
local_settings['JINJA_ENVIRONMENT']['extensions'] = \
local_settings['JINJA_EXTENSIONS']
del local_settings['JINJA_EXTENSIONS']
for key in ['TRANSLATION_FEED_ATOM',
'TRANSLATION_FEED_RSS'
]:
if key in local_settings and '%s' in local_settings[key]:
logger.warning('%%s usage in %s is deprecated, use {lang} '
'instead. Falling back to default.', key)
local_settings[key] = DEFAULT_CONFIG[key]
for key in ['AUTHOR_FEED_ATOM',
'AUTHOR_FEED_RSS',
'CATEGORY_FEED_ATOM',
'CATEGORY_FEED_RSS',
'TAG_FEED_ATOM',
'TAG_FEED_RSS',
]:
if key in local_settings and '%s' in local_settings[key]:
logger.warning('%%s usage in %s is deprecated, use {slug} '
'instead. Falling back to default.', key)
local_settings[key] = DEFAULT_CONFIG[key]
if isinstance(local_settings['PLUGIN_PATHS'], six.string_types):
logger.warning("Defining PLUGIN_PATHS setting as string "
"has been deprecated (should be a list)")