Hopiu/django-configurations
1
0
Fork 0
mirror of https://github.com/jazzband/django-configurations.git synced 2026-03-16 22:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:jezdez/django-configurations

Browse source
This commit is contained in:
Jannis Leidel 2014-12-12 17:26:43 +01:00
commit 5d1a8d7887
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configurations/values.py
View file

@ -266,7 +266,8 @@ class ValidationMixin(object):
else:
raise ValueError('Cannot use validator of '
'{0} ({1!r})'.format(self, self.validator))
self.to_python(self.default)
if self.default:
self.to_python(self.default)
def to_python(self, value):
try:

2
docs/patterns.rst
View file

@ -71,7 +71,7 @@ a ``Configuration`` class::
from configurations import Configuration
class Prod(Configuration, FullPageCaching):
class Prod(FullPageCaching, Configuration):
DEBUG = False
# ...

8
tests/test_values.py
View file

@ -216,6 +216,14 @@ class ValueTests(TestCase):
with env(DJANGO_TEST='httb://spam.eggs'):
self.assertRaises(ValueError, value.setup, 'TEST')
def test_url_values_with_no_default(self):
value = URLValue() # no default
with env(DJANGO_TEST='http://spam.eggs'):
self.assertEqual(value.setup('TEST'), 'http://spam.eggs')
def test_url_values_with_wrong_default(self):
self.assertRaises(ValueError, URLValue, 'httb://spam.eggs')
def test_ip_values(self):
value = IPValue('0.0.0.0')
with env(DJANGO_TEST='127.0.0.1'):