Support Django 1.9

praekelt · Jan 4, 2016 · 41401c3 · 41401c3
1 parent 3d8089d
commit 41401c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+next
+----
+#. Support Django 1.9.
+
 0.2 (2015-10-30)
 ----------------
 #. Django 1.8 support (lamby).

diff --git a/setuptest/setuptest.py b/setuptest/setuptest.py
@@ -147,7 +147,10 @@ def configure(self):
 
         import django
         from django.conf import settings
-        from django.utils.importlib import import_module
+        try:
+            from django.utils.importlib import import_module
+        except ImportError:
+            from importlib import import_module
         try:
             test_settings = import_module('test_settings')
         except ImportError as e: