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 branch 'master' of https://github.com/mapio/pelican

Browse source
This commit is contained in:
Alexis Metaireau 2011-02-15 11:03:51 +00:00
commit 384c579c4a
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pelican/__init__.py
View file

@ -18,13 +18,14 @@ class Pelican(object):
before doing anything else.
"""
self.path = path or settings['PATH']
if path or self.path.endswith('/'):
if not self.path:
raise Exception('you need to specify a path to search the docs on !')
if self.path.endswith('/'):
self.path = path[:-1]
# define the default settings
self.settings = settings
self.theme = theme or settings['THEME']
self.path = path
output_path = output_path or settings['OUTPUT_PATH']
self.output_path = os.path.realpath(output_path)
self.markup = markup or settings['MARKUP']
@ -39,11 +40,6 @@ class Pelican(object):
else:
raise Exception("Impossible to find the theme %s" % theme)
# get the list of files to parse
if not self.path:
raise Exception('you need to specify a path to search the docs on !')
def run(self):
"""Run the generators and return"""

2
pelican/writers.py
View file

@ -47,7 +47,7 @@ class Writer(object):
:param filename: the filename to output.
:param feed_type: the feed type to use (atom or rss)
"""
old_locale = locale.getlocale(locale.LC_ALL)
old_locale = locale.setlocale(locale.LC_ALL)
locale.setlocale(locale.LC_ALL, 'C')
try:
self.site_url = context.get('SITEURL', get_relative_path(filename))