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 pull request #150 from blaze33/master

Browse source 
Fix RemovedInDjango19Warning and test_database_url_value
This commit is contained in:
Daniel Hahler 2016-03-13 14:33:25 +01:00
commit 407af2e27d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configurations/utils.py
View file

@ -4,9 +4,9 @@ import sys
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.utils import six from django.utils import six
try: try:
from django.utils.importlib import import_module
except ImportError:
from importlib import import_module from importlib import import_module
except ImportError:
from django.utils.importlib import import_module
def isuppercase(name): def isuppercase(name):

1
tests/test_values.py
View file

@ -357,6 +357,7 @@ class ValueTests(TestCase):
with env(DATABASE_URL='sqlite://'): with env(DATABASE_URL='sqlite://'):
self.assertEqual(value.setup('DATABASE_URL'), { self.assertEqual(value.setup('DATABASE_URL'), {
'default': { 'default': {
'CONN_MAX_AGE': 0,
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
'HOST': '', 'HOST': '',
'NAME': ':memory:', 'NAME': ':memory:',