weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

fix testing failures

Browse source 
when settings could be pathlib.Path
This commit is contained in:
MinchinWeb 2020-04-23 13:47:10 -06:00
commit cfba3d72be
6 changed files with 58 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

52
pelican/generators.py
View file

@ -349,12 +349,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
str(self.settings['CATEGORY_FEED_ATOM']).format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_ATOM_URL',
str(self.settings['CATEGORY_FEED_ATOM'])).format(
str(self.settings['CATEGORY_FEED_ATOM']).format(
slug=cat.slug
),
)),
feed_title=cat.name
)
@ -362,12 +362,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
str(self.settings['CATEGORY_FEED_RSS']).format(slug=cat.slug),
self.settings.get(
'CATEGORY_FEED_RSS_URL',
str(self.settings['CATEGORY_FEED_RSS'])).format(
str(self.settings['CATEGORY_FEED_RSS']).format(
slug=cat.slug
),
)),
feed_title=cat.name,
feed_type='rss'
)
@ -377,12 +377,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
str(self.settings['AUTHOR_FEED_ATOM']).format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_ATOM_URL',
str(self.settings['AUTHOR_FEED_ATOM'])).format(
str(self.settings['AUTHOR_FEED_ATOM']).format(
slug=auth.slug
),
)),
feed_title=auth.name
)
@ -390,12 +390,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
str(self.settings['AUTHOR_FEED_RSS']).format(slug=auth.slug),
self.settings.get(
'AUTHOR_FEED_RSS_URL',
str(self.settings['AUTHOR_FEED_RSS'])).format(
str(self.settings['AUTHOR_FEED_RSS']).format(
slug=auth.slug
),
)),
feed_title=auth.name,
feed_type='rss'
)
@ -407,12 +407,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
str(self.settings['TAG_FEED_ATOM']).format(slug=tag.slug),
self.settings.get(
'TAG_FEED_ATOM_URL',
str(self.settings['TAG_FEED_ATOM'])).format(
str(self.settings['TAG_FEED_ATOM']).format(
slug=tag.slug
),
)),
feed_title=tag.name
)
@ -420,12 +420,12 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
arts,
self.context,
self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
str(self.settings['TAG_FEED_RSS']).format(slug=tag.slug),
self.settings.get(
'TAG_FEED_RSS_URL',
str(self.settings['TAG_FEED_RSS'])).format(
str(self.settings['TAG_FEED_RSS']).format(
slug=tag.slug
),
)),
feed_title=tag.name,
feed_type='rss'
)
@ -443,27 +443,31 @@ class ArticlesGenerator(CachingGenerator):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_ATOM']
.format(lang=lang),
str(
self.settings['TRANSLATION_FEED_ATOM']
).format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_ATOM_URL',
str(
self.settings['TRANSLATION_FEED_ATOM'])
self.settings['TRANSLATION_FEED_ATOM']
).format(lang=lang),
)
)
if self.settings.get('TRANSLATION_FEED_RSS'):
writer.write_feed(
items,
self.context,
self.settings['TRANSLATION_FEED_RSS']
.format(lang=lang),
str(
self.settings['TRANSLATION_FEED_RSS']
).format(lang=lang),
self.settings.get(
'TRANSLATION_FEED_RSS_URL',
str(self.settings['TRANSLATION_FEED_RSS'])).format(
str(self.settings['TRANSLATION_FEED_RSS']).format(
lang=lang
),
feed_type='rss'
)
)
def generate_articles(self, write):
"""Generate the articles."""