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

flake8 fixes

Browse source
This commit is contained in:
MinchinWeb 2020-05-21 21:43:06 -06:00
commit a133716709
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pelican/generators.py
View file

@ -462,11 +462,10 @@ class ArticlesGenerator(CachingGenerator):
).format(lang=lang), ).format(lang=lang),
self.settings.get( self.settings.get(
'TRANSLATION_FEED_RSS_URL', 'TRANSLATION_FEED_RSS_URL',
str(self.settings['TRANSLATION_FEED_RSS']).format( str(self.settings['TRANSLATION_FEED_RSS'])).format(
lang=lang lang=lang
), ),
feed_type='rss' feed_type='rss'
)
) )
def generate_articles(self, write): def generate_articles(self, write):

11
pelican/settings.py
View file

@ -6,6 +6,7 @@ import logging
import os import os
import re import re
from os.path import isabs from os.path import isabs
from pathlib import Path
from pelican.log import LimitFilter from pelican.log import LimitFilter
@ -406,7 +407,10 @@ def handle_deprecated_settings(settings):
for key in ['TRANSLATION_FEED_ATOM', for key in ['TRANSLATION_FEED_ATOM',
'TRANSLATION_FEED_RSS' 'TRANSLATION_FEED_RSS'
]: ]:
if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]: if (
settings.get(key) and not isinstance(settings[key], Path)
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.', key) 'instead.', key)
try: try:
@ -423,7 +427,10 @@ def handle_deprecated_settings(settings):
'TAG_FEED_ATOM', 'TAG_FEED_ATOM',
'TAG_FEED_RSS', 'TAG_FEED_RSS',
]: ]:
if settings.get(key) and not isinstance(settings[key], Path) and '%s' in settings[key]: if (
settings.get(key) and not isinstance(settings[key], Path)
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.', key) 'instead.', key)
try: try: