Ticket #904: django-env.diff

django/utils/translation.py

@@ -117 +117 @@
 
     globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
 
-    parts = os.environ['DJANGO_SETTINGS_MODULE'].split('.')
+    parts = settings.ROOT_URLCONF.split('.')
     project = __import__(parts[0], {}, {}, [])
     projectpath = os.path.join(os.path.dirname(project.__file__), 'locale')
 

django/conf/settings.py

@@ -8 +8 @@
 
 import os
 import sys
+import os.path
+import imp
 from django.conf import global_settings
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
+SETTINGS_FILE = "settings.py"
 
 # get a reference to this module (why isn't there a __module__ magic var?)
 me = sys.modules[__name__]
@@ -20 +23 @@
     if setting == setting.upper():
         setattr(me, setting, getattr(global_settings, setting))
 
-# try to load DJANGO_SETTINGS_MODULE
+# try to load DJANGO_SETTINGS_MODULE if not found walk the filesystem upwards
+# to find SETTINGS_FILE. If file is not found either raise EnvironmentError.
 try:
     me.SETTINGS_MODULE = os.environ[ENVIRONMENT_VARIABLE]
     if not me.SETTINGS_MODULE: # If it's set but is an empty string.
         raise KeyError
 except KeyError:
-    raise EnvironmentError, "Environment variable %s is undefined." % ENVIRONMENT_VARIABLE
+    cwd = os.getcwdu()
+    
+    while cwd != '/':
+        if os.path.exists(cwd + '/' + SETTINGS_FILE):
+            mod = imp.load_source('settings', cwd + '/' + SETTINGS_FILE)
+            break
+        else:
+            cwd = os.path.split(cwd)[0]
+    else:
+        raise EnvironmentError, "Environment variable %s is undefined." % \
+            ENVIRONMENT_VARIABLE
+else:
+    try:
+        mod = __import__(me.SETTINGS_MODULE, '', '', [''])
+    except ImportError, e:
+        raise EnvironmentError, "Could not import %s '%s' (is it on sys.path?): %s" % \
+            (ENVIRONMENT_VARIABLE, me.SETTINGS_MODULE, e)
 
-try:
-    mod = __import__(me.SETTINGS_MODULE, '', '', [''])
-except ImportError, e:
-    raise EnvironmentError, "Could not import %s '%s' (is it on sys.path?): %s" % (ENVIRONMENT_VARIABLE, me.SETTINGS_MODULE, e)
-
 # Settings that should be converted into tuples if they're mistakenly entered
 # as strings.
 tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS")