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

Build settings paths as strings

Browse source 
… instead of `posix_join`. Fixes #2431
This commit is contained in:
Justin Mayer 2020-05-10 07:50:32 +02:00
commit d0457dcfb8
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pelican/settings.py
View file

@ -6,7 +6,6 @@ import logging
import os import os
import re import re
from os.path import isabs from os.path import isabs
from posixpath import join as posix_join
from pelican.log import LimitFilter from pelican.log import LimitFilter
@ -36,11 +35,11 @@ DEFAULT_CONFIG = {
'STATIC_EXCLUDE_SOURCES': True, 'STATIC_EXCLUDE_SOURCES': True,
'THEME_STATIC_DIR': 'theme', 'THEME_STATIC_DIR': 'theme',
'THEME_STATIC_PATHS': ['static', ], 'THEME_STATIC_PATHS': ['static', ],
'FEED_ALL_ATOM': posix_join('feeds', 'all.atom.xml'), 'FEED_ALL_ATOM': 'feeds/all.atom.xml',
'CATEGORY_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'), 'CATEGORY_FEED_ATOM': 'feeds/{slug}.atom.xml',
'AUTHOR_FEED_ATOM': posix_join('feeds', '{slug}.atom.xml'), 'AUTHOR_FEED_ATOM': 'feeds/{slug}.atom.xml',
'AUTHOR_FEED_RSS': posix_join('feeds', '{slug}.rss.xml'), 'AUTHOR_FEED_RSS': 'feeds/{slug}.rss.xml',
'TRANSLATION_FEED_ATOM': posix_join('feeds', 'all-{lang}.atom.xml'), 'TRANSLATION_FEED_ATOM': 'feeds/all-{lang}.atom.xml',
'FEED_MAX_ITEMS': '', 'FEED_MAX_ITEMS': '',
'RSS_FEED_SUMMARY_ONLY': True, 'RSS_FEED_SUMMARY_ONLY': True,
'SITEURL': '', 'SITEURL': '',
@ -65,29 +64,28 @@ DEFAULT_CONFIG = {
'ARTICLE_LANG_URL': '{slug}-{lang}.html', 'ARTICLE_LANG_URL': '{slug}-{lang}.html',
'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html', 'ARTICLE_LANG_SAVE_AS': '{slug}-{lang}.html',
'DRAFT_URL': 'drafts/{slug}.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_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_URL': 'pages/{slug}.html',
'PAGE_SAVE_AS': posix_join('pages', '{slug}.html'), 'PAGE_SAVE_AS': 'pages/{slug}.html',
'PAGE_ORDER_BY': 'basename', 'PAGE_ORDER_BY': 'basename',
'PAGE_LANG_URL': 'pages/{slug}-{lang}.html', '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_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_URL': 'drafts/pages/{slug}-{lang}.html',
'DRAFT_PAGE_LANG_SAVE_AS': posix_join('drafts', 'pages', 'DRAFT_PAGE_LANG_SAVE_AS': 'drafts/pages/{slug}-{lang}.html',
'{slug}-{lang}.html'),
'STATIC_URL': '{path}', 'STATIC_URL': '{path}',
'STATIC_SAVE_AS': '{path}', 'STATIC_SAVE_AS': '{path}',
'STATIC_CREATE_LINKS': False, 'STATIC_CREATE_LINKS': False,
'STATIC_CHECK_IF_MODIFIED': False, 'STATIC_CHECK_IF_MODIFIED': False,
'CATEGORY_URL': 'category/{slug}.html', '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_URL': 'tag/{slug}.html',
'TAG_SAVE_AS': posix_join('tag', '{slug}.html'), 'TAG_SAVE_AS': 'tag/{slug}.html',
'AUTHOR_URL': 'author/{slug}.html', 'AUTHOR_URL': 'author/{slug}.html',
'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'), 'AUTHOR_SAVE_AS': 'author/{slug}.html',
'PAGINATION_PATTERNS': [ 'PAGINATION_PATTERNS': [
(1, '{name}{extension}', '{name}{extension}'), (1, '{name}{extension}', '{name}{extension}'),
(2, '{name}{number}{extension}', '{name}{number}{extension}'), (2, '{name}{number}{extension}', '{name}{number}{extension}'),