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' into feeddomain

Browse source 
Conflicts:
	pelican/settings.py
	tests/test_settings.py
This commit is contained in:
Justin Mayer 2012-03-22 08:29:27 -07:00
commit 6e467172e5
17 changed files with 135 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/test_settings.py
View file

@ -1,14 +1,10 @@
try:
import unittest2
except ImportError, e:
import unittest as unittest2
from os.path import dirname, abspath, join
from pelican.settings import read_settings, configure_settings, _DEFAULT_CONFIG
from .support import unittest
class TestSettingsConfiguration(unittest2.TestCase):
class TestSettingsConfiguration(unittest.TestCase):
"""Provided a file, it should read it, replace the default values,
append new values to the settings (if any), and apply basic settings
optimizations.