From a06fd61ffc731e0b669303a53f4a03883b20145d Mon Sep 17 00:00:00 2001 From: MinchinWeb Date: Sat, 3 Nov 2018 11:09:17 -0600 Subject: [PATCH 1/2] fix indent The indent appears to have been messed up on the merge. --- pelican/settings.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pelican/settings.py b/pelican/settings.py index 6907051c..3119a0b9 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -386,24 +386,24 @@ def handle_deprecated_settings(settings): settings.pop(f + '_SUBSTITUTIONS', None) # `%s` -> '{slug}` or `{lang}` in FEED settings - for key in ['TRANSLATION_FEED_ATOM', - 'TRANSLATION_FEED_RSS' - ]: - if key in settings and '%s' in settings[key]: - logger.warning('%%s usage in %s is deprecated, use {lang} ' - 'instead. Falling back to default.', key) - 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 settings and '%s' in settings[key]: - logger.warning('%%s usage in %s is deprecated, use {slug} ' - 'instead. Falling back to default.', key) - settings[key] = DEFAULT_CONFIG[key] + for key in ['TRANSLATION_FEED_ATOM', + 'TRANSLATION_FEED_RSS' + ]: + if key in settings and '%s' in settings[key]: + logger.warning('%%s usage in %s is deprecated, use {lang} ' + 'instead. Falling back to default.', key) + 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 settings and '%s' in settings[key]: + logger.warning('%%s usage in %s is deprecated, use {slug} ' + 'instead. Falling back to default.', key) + settings[key] = DEFAULT_CONFIG[key] return settings From 4d0de58409591187779814b5cc488d2558dedc68 Mon Sep 17 00:00:00 2001 From: Justin Mayer Date: Sun, 11 Nov 2018 12:54:42 +0100 Subject: [PATCH 2/2] Fix PyCodeStyle violations --- pelican/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pelican/settings.py b/pelican/settings.py index 3119a0b9..08a6c432 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -391,7 +391,7 @@ def handle_deprecated_settings(settings): ]: if key in settings and '%s' in settings[key]: 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] for key in ['AUTHOR_FEED_ATOM', 'AUTHOR_FEED_RSS', @@ -402,7 +402,7 @@ def handle_deprecated_settings(settings): ]: if key in settings and '%s' in settings[key]: 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] return settings