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

Merge pull request #137 from borgar/upstream

Browse source 
read_settings should be passed a string argument
This commit is contained in:
Simon Liedtke 2011-06-16 08:52:02 -07:00
commit a66fa4c77d
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pelican/__init__.py
View file

@ -102,7 +102,7 @@ def main():
parser.add_argument('-m', '--markup', default=None, dest='markup', parser.add_argument('-m', '--markup', default=None, dest='markup',
help='the list of markup language to use (rst or md). Please indicate ' help='the list of markup language to use (rst or md). Please indicate '
'them separated by commas') 'them separated by commas')
parser.add_argument('-s', '--settings', dest='settings', parser.add_argument('-s', '--settings', dest='settings', default='',
help='the settings of the application. Default to False.') help='the settings of the application. Default to False.')
parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir', parser.add_argument('-d', '--delete-output-directory', dest='delete_outputdir',
action='store_true', help='Delete the output directory.') action='store_true', help='Delete the output directory.')
@ -124,8 +124,6 @@ def main():
# the variable with None. # the variable with None.
markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None markup = [a.strip().lower() for a in args.markup.split(',')] if args.markup else None
if args.settings is None:
settings = {}
settings = read_settings(args.settings) settings = read_settings(args.settings)
cls = settings.get('PELICAN_CLASS') cls = settings.get('PELICAN_CLASS')