Ticket #1371: 1371.diff

django/conf/__init__.py

@@ -110 +110 @@
                 new_installed_apps.append(app)
         self.INSTALLED_APPS = new_installed_apps
 
+        # Install default values from apps, listed in a module named default_settings.
+        for app in self.INSTALLED_APPS: 
+            try: 
+                dapp = __import__("%s.default_settings" %app, '', '', ['']) 
+                for setting in dir(dapp): 
+                    if setting == setting.upper() and not hasattr(self, setting): 
+                        setattr(self, setting, getattr(dapp, setting)) 
+            except ImportError: 
+                pass 
+
         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).