Ticket #5049: django-settings.patch

django/conf/__init__.py

@@ -8 +8 @@
 
 import os
 import time     # Needed for Windows
+import warnings
+
 from django.conf import global_settings
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -108 +110 @@
                 new_installed_apps.append(app)
         self.INSTALLED_APPS = new_installed_apps
 
+        # Import installed apps settings into this namespace
+        # The downside of this method is that apps with the same name but in
+        # different namespaces will clobber one another
+        for app_name in self.INSTALLED_APPS:
+            last_part = app_name.split('.')[-1]
+            try:
+                # import the application's settings.py
+                # this will be the defaults
+                mod = __import__('%s.settings' % app_name,
+                                 globals(),
+                                 locals(),
+                                 ['*'])
+            except ImportError:
+                # If it doesn't exist, move on
+                pass
+            else:
+                # Warn in case we're stomping on configuration
+                if hasattr(self, last_part):
+                    warnings.warn(
+                      ('While trying to import application settings for %s it '
+                       'appears another installed application is named %s. '
+                       'This will result in %s stomping on the other '
+                       "application's configuration. You should rename one or "
+                       'the other.') % (app_name, last_part, app_name),
+                      RuntimeWarning)
+                      
+                # Populate a UserSettingsHolder with the uppercase attributes
+                # It will be our set of defaults for local_app_settings
+                app_settings = UserSettingsHolder(object())
+                for attr in dir(mod):
+                    if attr == attr.upper():
+                        attr_value = getattr(mod, attr)
+                        setattr(app_settings, attr, attr_value)
+                
+                # On a per-site/project basis, the application configuration
+                # can be overridden, so we must get local overrides
+                local_app_settings = UserSettingsHolder(app_settings)
+                try:
+                    mod = __import__('app_settings.%s' % last_part,
+                                     globals(),
+                                     locals(),
+                                     ['*'])
+                except ImportError:
+                    # If there are no overrides, move on
+                    # The application defaults will still be used
+                    pass
+                else:
+                    for attr in dir(mod):
+                        if attr == attr.upper():
+                            attr_value = getattr(mod, attr)
+                            setattr(app_settings, attr, attr_value)
+                               
+                # set the net application settings as an attribute of self
+                setattr(self, last_part, local_app_settings)
+
         if hasattr(time, 'tzset'):
             # Move the time zone info into os.environ. See ticket #2315 for why
             # we don't do this unconditionally (breaks Windows).