Ticket #13053: a_s-draft.diff

django/conf/__init__.py

@@ -149 +149 @@
     # For Python < 2.6:
     __members__ = property(lambda self: self.__dir__())
 
-settings = LazySettings()
+# Must be set here to be used within ActiveSettings
+LAZY_SETTINGS = LazySettings()
 
+class ActiveSettings(object):
+    """
+    Serves ActiveSettings. Falls back to LazySettings() for everything else.
+    """
+    def __init__(self):
+        self.lazy_settings = LAZY_SETTINGS
+    def __getattr__(self, name):
+        active_settings = getattr(self.lazy_settings, 'ACTIVE_SETTINGS')
+        if name in active_settings:
+            return importlib.import_module(active_settings[name])
+        else:
+            return getattr(self.lazy_settings, name)
+    def __dir__(self):
+        return self.__dict__.keys() + dir(self.lazy_settings)
+
+    # For Python < 2.6:
+    __members__ = property(lambda self: self.__dir__())         
+
+# Just to make sure that the overhead of ActiveSettings is only introduced if it is configured.
+if LAZY_SETTINGS.ACTIVE_SETTINGS:
+    settings = ActiveSettings()
+else:
+    settings = LAZY_SETTINGS
+

django/conf/global_settings.py

@@ -386 +386 @@
 DEFAULT_TABLESPACE = ''
 DEFAULT_INDEX_TABLESPACE = ''
 
+# Dictionary of settings that will be made active. Example below
+# ACTIVE_SETTINGS = {'EMAIL_HOST': 'myproject.myapp.myfile.mycallable'}
+ACTIVE_SETTINGS = {}
+
 ##############
 # MIDDLEWARE #
 ##############