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

Simplified configuration option to be more flexible

Browse source 
As @ametaireau suggested: instead of having logic that prepends the
OUTPUT_SOURCES_EXTENSION with a '.' we allow the user more
flexibility to control the extension that can be used.
This commit is contained in:
Nico Di Rocco 2012-10-03 22:06:45 +02:00
commit c53a06a5d5
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/settings.rst
View file

@ -73,8 +73,8 @@ Setting name (default value) What doe
original format (e.g. Markdown or ReStructeredText) to the original format (e.g. Markdown or ReStructeredText) to the
specified OUTPUT_PATH. specified OUTPUT_PATH.
`OUTPUT_SOURCES_EXTENSION` (``.text``) Controls the extension that will be used by the SourcesGenerator. `OUTPUT_SOURCES_EXTENSION` (``.text``) Controls the extension that will be used by the SourcesGenerator.
Defaults to .text. If the first character is not a `.` the Defaults to ``.text``. If not a valid string the default value
dot character will be prepended to the extension. will be used.
`RELATIVE_URLS` (``True``) Defines whether Pelican should use document-relative URLs or `RELATIVE_URLS` (``True``) Defines whether Pelican should use document-relative URLs or
not. If set to ``False``, Pelican will use the SITEURL not. If set to ``False``, Pelican will use the SITEURL
setting to construct absolute URLs. setting to construct absolute URLs.

9
pelican/settings.py
View file

@ -177,15 +177,10 @@ def configure_settings(settings, default_settings=None, filename=None):
settings['WEBASSETS'] = False settings['WEBASSETS'] = False
if 'OUTPUT_SOURCES_EXTENSION' in settings: if 'OUTPUT_SOURCES_EXTENSION' in settings:
try: if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str):
if not isinstance(settings['OUTPUT_SOURCES_EXTENSION'], str): settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
raise ValueError
elif '.' is not settings['OUTPUT_SOURCES_EXTENSION'][0]:
settings['OUTPUT_SOURCES_EXTENSION'] = '.' + settings['OUTPUT_SOURCES_EXTENSION']
except(ValueError, IndexError):
logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION." logger.warn("Detected misconfiguration with OUTPUT_SOURCES_EXTENSION."
" falling back to the default extension " + " falling back to the default extension " +
_DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']) _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION'])
settings['OUTPUT_SOURCES_EXTENSION'] = _DEFAULT_CONFIG['OUTPUT_SOURCES_EXTENSION']
return settings return settings