Ticket #6546: app_settings_jannis.1.diff

django/conf/__init__.py

@@ -109 +109 @@
             else:
                 new_installed_apps.append(app)
         self.INSTALLED_APPS = new_installed_apps
+        
+        # load settings from apps if not already existing in project settings
+        for app in self.INSTALLED_APPS:
+            try:
+                app_settings = __import__("%s.settings" % app, {}, {}, [''])
+                for setting in dir(app_settings):
+                    existing = getattr(self, setting, None)
+                    if setting == setting.upper() and existing is None:
+                        setting_value = getattr(app_settings, setting)
+                        if setting in tuple_settings and type(setting_value) == str:
+                            setting_value = (setting_value,) # In case the user forgot the comma.
+                        setattr(self, setting, setting_value)
+            except ImportError:
+                pass
 
         if hasattr(time, 'tzset'):
             # Move the time zone info into os.environ. See ticket #2315 for why