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

Check all lists are not strings.

Browse source
This commit is contained in:
Alexis Métaireau 2013-03-23 19:56:45 -07:00
commit cb5f66ffe0
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pelican/settings.py
View file

@ -234,14 +234,25 @@ def configure_settings(settings):
settings['FILENAME_METADATA'] = ( settings['FILENAME_METADATA'] = (
_DEFAULT_CONFIG['FILENAME_METADATA']) _DEFAULT_CONFIG['FILENAME_METADATA'])
# Save people from accidentally setting site/css vs [site/css] # Save people from accidentally setting a string rather than a list
path_keys = ['STATIC_PATHS', 'THEME_STATIC_PATHS'] path_keys = (
'ARTICLE_EXCLUDES',
'DEFAULT_METADATA',
'DIRECT_TEMPLATES',
'EXTRA_TEMPLATES_PATHS',
'FILES_TO_COPY',
'IGNORE_FILES',
'JINJA_EXTENSIONS',
'MARKUP',
'PAGINATED_DIRECT_TEMPLATES',
'PLUGINS',
'STATIC_PATHS',
'THEME_STATIC_PATHS',)
for PATH_KEY in filter(lambda k: k in settings, path_keys): for PATH_KEY in filter(lambda k: k in settings, path_keys):
if isinstance(settings[PATH_KEY], six.string_types): if isinstance(settings[PATH_KEY], six.string_types):
logger.warn("Detected misconfiguration with %s setting (must " logger.warn("Detected misconfiguration with %s setting (must "
"be a list of paths), falling back to the default" "be a list), falling back to the default"
% PATH_KEY) % PATH_KEY)
settings[PATH_KEY] = \ settings[PATH_KEY] = _DEFAULT_CONFIG[PATH_KEY]
_DEFAULT_CONFIG[PATH_KEY]
return settings return settings