From d28bc82d56ceb50038a0e78e425ff9e8afac1012 Mon Sep 17 00:00:00 2001
From: MinchinWeb <w_minchin@hotmail.com>
Date: Thu, 23 Apr 2020 12:49:44 -0600
Subject: [PATCH] Allow generators to deal with settings that are
 `pathlib.Path`s

---
 pelican/generators.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 232f4759..647a8a15 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -20,7 +20,6 @@ from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
                            posixize_path, process_translations)
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -324,8 +323,9 @@ class ArticlesGenerator(CachingGenerator):
             all_articles = list(self.articles)
             for article in self.articles:
                 all_articles.extend(article.translations)
-            order_content(all_articles,
-                          order_by=self.settings['ARTICLE_ORDER_BY'])
+            order_content(
+                all_articles, order_by=self.settings['ARTICLE_ORDER_BY']
+            )
 
             if self.settings.get('FEED_ALL_ATOM'):
                 writer.write_feed(
@@ -354,7 +354,7 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['CATEGORY_FEED_ATOM'].format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_ATOM_URL',
-                        self.settings['CATEGORY_FEED_ATOM']).format(
+                        str(self.settings['CATEGORY_FEED_ATOM'])).format(
                             slug=cat.slug
                         ),
                     feed_title=cat.name
@@ -367,7 +367,7 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['CATEGORY_FEED_RSS'].format(slug=cat.slug),
                     self.settings.get(
                         'CATEGORY_FEED_RSS_URL',
-                        self.settings['CATEGORY_FEED_RSS']).format(
+                        str(self.settings['CATEGORY_FEED_RSS'])).format(
                             slug=cat.slug
                         ),
                     feed_title=cat.name,
@@ -382,8 +382,9 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['AUTHOR_FEED_ATOM'].format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_ATOM_URL',
-                        self.settings['AUTHOR_FEED_ATOM']
-                        ).format(slug=auth.slug),
+                        str(self.settings['AUTHOR_FEED_ATOM'])).format(
+                            slug=auth.slug
+                        ),
                     feed_title=auth.name
                     )
 
@@ -394,8 +395,9 @@ class ArticlesGenerator(CachingGenerator):
                     self.settings['AUTHOR_FEED_RSS'].format(slug=auth.slug),
                     self.settings.get(
                         'AUTHOR_FEED_RSS_URL',
-                        self.settings['AUTHOR_FEED_RSS']
-                        ).format(slug=auth.slug),
+                        str(self.settings['AUTHOR_FEED_RSS'])).format(
+                            slug=auth.slug
+                        ),
                     feed_title=auth.name,
                     feed_type='rss'
                     )
@@ -410,8 +412,9 @@ class ArticlesGenerator(CachingGenerator):
                         self.settings['TAG_FEED_ATOM'].format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_ATOM_URL',
-                            self.settings['TAG_FEED_ATOM']
-                            ).format(slug=tag.slug),
+                            str(self.settings['TAG_FEED_ATOM'])).format(
+                                slug=tag.slug
+                            ),
                         feed_title=tag.name
                         )
 
@@ -422,8 +425,9 @@ class ArticlesGenerator(CachingGenerator):
                         self.settings['TAG_FEED_RSS'].format(slug=tag.slug),
                         self.settings.get(
                             'TAG_FEED_RSS_URL',
-                            self.settings['TAG_FEED_RSS']
-                            ).format(slug=tag.slug),
+                            str(self.settings['TAG_FEED_RSS'])).format(
+                                slug=tag.slug
+                            ),
                         feed_title=tag.name,
                         feed_type='rss'
                         )
@@ -445,7 +449,8 @@ class ArticlesGenerator(CachingGenerator):
                             .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_ATOM_URL',
-                            self.settings['TRANSLATION_FEED_ATOM']
+                            str(
+                                self.settings['TRANSLATION_FEED_ATOM'])
                             ).format(lang=lang),
                         )
                 if self.settings.get('TRANSLATION_FEED_RSS'):
@@ -456,8 +461,9 @@ class ArticlesGenerator(CachingGenerator):
                             .format(lang=lang),
                         self.settings.get(
                             'TRANSLATION_FEED_RSS_URL',
-                            self.settings['TRANSLATION_FEED_RSS']
-                            ).format(lang=lang),
+                            str(self.settings['TRANSLATION_FEED_RSS'])).format(
+                                lang=lang
+                            ),
                         feed_type='rss'
                         )