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

Merge branch tests into main. (See #44)

Browse source 
Conflicts:
	pelican/contents.py
	pelican/settings.py
	samples/pelican.conf.py
This commit is contained in:
Alexis Metaireau 2011-05-10 23:18:11 +01:00
commit 371892ceaa
6 changed files with 128 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pelican/settings.py
View file

@ -2,10 +2,10 @@
import os
import locale
_DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
DEFAULT_THEME = os.sep.join([os.path.dirname(os.path.abspath(__file__)),
"themes/notmyidea"])
_DEFAULT_CONFIG = {'PATH': None,
'THEME': _DEFAULT_THEME,
'THEME': DEFAULT_THEME,
'OUTPUT_PATH': 'output/',
'MARKUP': ('rst', 'md'),
'STATIC_PATHS': ['images',],
@ -40,7 +40,7 @@ _DEFAULT_CONFIG = {'PATH': None,
'DEFAULT_METADATA': (),
'FILES_TO_COPY': (),
'DEFAULT_STATUS': 'published',
}
}
def read_settings(filename):
"""Load a Python file into a dictionary.