setup_environ is depreacted in Django 1.4

celery · Feb 27, 2012 · 08f1dd7 · 08f1dd7
1 parent 80e04e1
commit 08f1dd7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cyme/bin/base.py b/cyme/bin/base.py
@@ -11,8 +11,11 @@
 from .. import __version__, DEBUG, DEBUG_BLOCK, DEBUG_READERS
 
 import getpass
+import os
 import sys
 
+from importlib import import_module
+
 from kombu.utils import cached_property
 
 from ..utils import Path
@@ -49,9 +52,12 @@ def configure(self):
         from django.conf import settings
         from .. import settings as default_settings
         from ..utils import imerge_settings
+        mod = os.environ.setdefault("DJANGO_SETTINGS_MODULE",
+                                    default_settings.__name__)
 
         if not settings.configured:
-            self.management.setup_environ(default_settings)
+            if django.VERSION < (1, 4):
+                self.management.setup_environ(import_module(mod))
         else:
             imerge_settings(settings, default_settings)
         if self.instance_dir:

diff --git a/docs/conf.py b/docs/conf.py
@@ -10,9 +10,11 @@
 # absolute, like shown here.
 sys.path.append(os.path.join(os.pardir, "tests"))
 sys.path.append(os.path.join(this, "_ext"))
-from django.core.management import setup_environ
-import settings
-setup_environ(settings)
+settings = os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+import django
+if django.VERSION < (1, 4):
+    from django.core.management import setup_environ
+    setup_environ(__import__(settings))
 import cyme