diff options
| author | Justin Mayer <entroP@gmail.com> | 2020-05-10 07:50:32 +0200 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2020-05-10 07:50:32 +0200 |
| commit | d1338f201d2bc69122ba624558e1c4f0d2b002f5 (patch) | |
| tree | c9c1eafaebdbf12716ea2d3deb3a06768850fbe1 | |
| parent | ca1c58e20186c3128955aedb97ce1c1da569cff2 (diff) | |
| download | pelican-settings-join-paths.tar.gz | |
Build settings paths as stringssettings-join-paths
… instead of `posix_join`. Fixes #2431
| -rw-r--r-- | pelican/settings.py | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/pelican/settings.py b/pelican/settings.py index d219a8f2..7b333de8 100644 --- a/pelican/settings.py +++ b/pelican/settings.py @@ -6,7 +6,6 @@ import logging import os import re from os.path import isabs -from posixpath import join as posix_join from pelican.log import LimitFilter @@ -36,11 +35,11 @@ DEFAULT_CONFIG = { 'STATIC_EXCLUDE_SOURCES': True, 'THEME_STATIC_DIR': 'theme', 'THEME_STATIC_PATHS': ['static', ], - 'FEED_ALL_ATOM': posix_join('feeds', 'all.atom.xml'), - 'CATEGORY_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'), - 'AUTHOR_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'), - 'AUTHOR_FEED_RSS': posix_join('feeds', '{slug}.rss.xml'), - 'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-{lang}.atom.xml'), + 'FEED_ALL_ATOM': 'feeds/all.atom.xml', + 'CATEGORY_FEED_ATOM': 'feeds/{slug}.atom.xml', + 'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml', + 'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml', + 'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml', 'FEED_MAX_ITEMS': '', 'RSS_FEED_SUMMARY_ONLY': True, 'SITEURL': '', @@ -65,29 +64,28 @@ DEFAULT_CONFIG = { 'ARTICLE_LANG_URL': '{slug}-{lang}.html', 'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html', 'DRAFT_URL': 'drafts/{slug}.html', - 'DRAFT_SAVE_AS': posix_join('drafts', '{slug}.html'), + 'DRAFT_SAVE_AS': 'drafts/{slug}.html', 'DRAFT_LANG_URL': 'drafts/{slug}-{lang}.html', - 'DRAFT_LANG_SAVE_AS': posix_join('drafts', '{slug}-{lang}.html'), + 'DRAFT_LANG_SAVE_AS': 'drafts/{slug}-{lang}.html', 'PAGE_URL': 'pages/{slug}.html', - 'PAGE_SAVE_AS': posix_join('pages', '{slug}.html'), + 'PAGE_SAVE_AS': 'pages/{slug}.html', 'PAGE_ORDER_BY': 'basename', 'PAGE_LANG_URL': 'pages/{slug}-{lang}.html', - 'PAGE_LANG_SAVE_AS': posix_join('pages', '{slug}-{lang}.html'), + 'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html', 'DRAFT_PAGE_URL': 'drafts/pages/{slug}.html', - 'DRAFT_PAGE_SAVE_AS': posix_join('drafts', 'pages', '{slug}.html'), + 'DRAFT_PAGE_SAVE_AS': 'drafts/pages/{slug}.html', 'DRAFT_PAGE_LANG_URL': 'drafts/pages/{slug}-{lang}.html', - 'DRAFT_PAGE_LANG_SAVE_AS': posix_join('drafts', 'pages', - '{slug}-{lang}.html'), + 'DRAFT_PAGE_LANG_SAVE_AS': 'drafts/pages/{slug}-{lang}.html', 'STATIC_URL': '{path}', 'STATIC_SAVE_AS': '{path}', 'STATIC_CREATE_LINKS': False, 'STATIC_CHECK_IF_MODIFIED': False, 'CATEGORY_URL': 'category/{slug}.html', - 'CATEGORY_SAVE_AS': posix_join('category', '{slug}.html'), + 'CATEGORY_SAVE_AS': 'category/{slug}.html', 'TAG_URL': 'tag/{slug}.html', - 'TAG_SAVE_AS': posix_join('tag', '{slug}.html'), + 'TAG_SAVE_AS': 'tag/{slug}.html', 'AUTHOR_URL': 'author/{slug}.html', - 'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'), + 'AUTHOR_SAVE_AS': 'author/{slug}.html', 'PAGINATION_PATTERNS': [ (1, '{name}{extension}', '{name}{extension}'), (2, '{name}{number}{extension}', '{name}{number}{extension}'), |