diff --git a/architect/orms/django/__init__.py b/architect/orms/django/__init__.py index d175623..b912424 100644 --- 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