Merge 3ca39a8 into 49ce315

maxtepkeev · Sep 22, 2016 · 85e6e9e · 85e6e9e
2 parents 49ce315 + 3ca39a8
commit 85e6e9e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/architect/orms/django/__init__.py b/architect/orms/django/__init__.py
@@ -1,9 +1,13 @@
 def init():
     import os
+    from distutils.version import StrictVersion
 
     if 'DJANGO_SETTINGS_MODULE' in os.environ:
         try:
             import django
-            django.setup()
+            if StrictVersion(django.get_version()) < StrictVersion('1.7.0'):
+                from django.conf import settings
+            else:
+                django.setup()
         except AttributeError:
             pass