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

Merge branch '{slug}-indent'

Browse source
This commit is contained in:
Justin Mayer 2018-11-11 12:55:40 +01:00
commit af9859d7cc
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pelican/settings.py
View file

@ -386,24 +386,24 @@ def handle_deprecated_settings(settings):
settings.pop(f + '_SUBSTITUTIONS', None) settings.pop(f + '_SUBSTITUTIONS', None)
# `%s` -> '{slug}` or `{lang}` in FEED settings # `%s` -> '{slug}` or `{lang}` in FEED settings
for key in ['TRANSLATION_FEED_ATOM', for key in ['TRANSLATION_FEED_ATOM',
'TRANSLATION_FEED_RSS' 'TRANSLATION_FEED_RSS'
]: ]:
if key in settings and '%s' in settings[key]: if key in settings and '%s' in settings[key]:
logger.warning('%%s usage in %s is deprecated, use {lang} ' logger.warning('%%s usage in %s is deprecated, use {lang} '
'instead. Falling back to default.', key) 'instead. Falling back to default.', key)
settings[key] = DEFAULT_CONFIG[key] settings[key] = DEFAULT_CONFIG[key]
for key in ['AUTHOR_FEED_ATOM', for key in ['AUTHOR_FEED_ATOM',
'AUTHOR_FEED_RSS', 'AUTHOR_FEED_RSS',
'CATEGORY_FEED_ATOM', 'CATEGORY_FEED_ATOM',
'CATEGORY_FEED_RSS', 'CATEGORY_FEED_RSS',
'TAG_FEED_ATOM', 'TAG_FEED_ATOM',
'TAG_FEED_RSS', 'TAG_FEED_RSS',
]: ]:
if key in settings and '%s' in settings[key]: if key in settings and '%s' in settings[key]:
logger.warning('%%s usage in %s is deprecated, use {slug} ' logger.warning('%%s usage in %s is deprecated, use {slug} '
'instead. Falling back to default.', key) 'instead. Falling back to default.', key)
settings[key] = DEFAULT_CONFIG[key] settings[key] = DEFAULT_CONFIG[key]
return settings return settings