Merge pull request #150 from blaze33/master

Fix RemovedInDjango19Warning and test_database_url_value
jazzband · Mar 13, 2016 · 407af2e · 407af2e
2 parents d66ecc6 + 7b4df1f
commit 407af2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/configurations/utils.py b/configurations/utils.py
@@ -4,9 +4,9 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import six
 try:
-    from django.utils.importlib import import_module
-except ImportError:
     from importlib import import_module
+except ImportError:
+    from django.utils.importlib import import_module
 
 
 def isuppercase(name):

diff --git a/tests/test_values.py b/tests/test_values.py
@@ -357,6 +357,7 @@ def test_database_url_value(self):
         with env(DATABASE_URL='sqlite://'):
             self.assertEqual(value.setup('DATABASE_URL'), {
                 'default': {
+                    'CONN_MAX_AGE': 0,
                     'ENGINE': 'django.db.backends.sqlite3',
                     'HOST': '',
                     'NAME': ':memory:',