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

remove useless default_settings param in configure_settings

Browse source
This commit is contained in:
Bruno Binet 2012-10-15 22:49:24 +02:00
commit 136e2e46d8
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/settings.py
View file

@ -87,7 +87,7 @@ def read_settings(filename=None):
local_settings = get_settings_from_file(filename) local_settings = get_settings_from_file(filename)
else: else:
local_settings = copy.deepcopy(_DEFAULT_CONFIG) local_settings = copy.deepcopy(_DEFAULT_CONFIG)
configured_settings = configure_settings(local_settings, None, filename) configured_settings = configure_settings(local_settings, filename)
return configured_settings return configured_settings
@ -115,11 +115,8 @@ def get_settings_from_file(filename, default_settings=_DEFAULT_CONFIG):
return get_settings_from_module(module, default_settings=default_settings) return get_settings_from_module(module, default_settings=default_settings)
def configure_settings(settings, default_settings=None, filename=None): def configure_settings(settings, filename=None):
"""Provide optimizations, error checking, and warnings for loaded settings""" """Provide optimizations, error checking, and warnings for loaded settings"""
if default_settings is None:
default_settings = copy.deepcopy(_DEFAULT_CONFIG)
# Make the paths relative to the settings file # Make the paths relative to the settings file
if filename: if filename:
for path in ['PATH', 'OUTPUT_PATH']: for path in ['PATH', 'OUTPUT_PATH']: