Fixed #29324 -- Made Settings raise ImproperlyConfigured if SECRET_KEY is accessed and not set.

1 files changed, 8 insertions, 3 deletions

diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 9e4b0a4b1e..6813afb3b8 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -115,15 +115,15 @@ class Settings:
             if setting.isupper():
                 setting_value = getattr(mod, setting)
 
+                if setting == 'SECRET_KEY' and not setting_value:
+                    raise ImproperlyConfigured('The SECRET_KEY setting must not be empty.')
+
                 if (setting in tuple_settings and
                         not isinstance(setting_value, (list, tuple))):
                     raise ImproperlyConfigured("The %s setting must be a list or a tuple. " % setting)
                 setattr(self, setting, setting_value)
                 self._explicit_settings.add(setting)
 
-        if not self.SECRET_KEY:
-            raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
-
         if self.is_overridden('DEFAULT_CONTENT_TYPE'):
             warnings.warn('The DEFAULT_CONTENT_TYPE setting is deprecated.', RemovedInDjango30Warning)
 
@@ -139,6 +139,11 @@ class Settings:
             os.environ['TZ'] = self.TIME_ZONE
             time.tzset()
 
+    def __getattr__(self, name):
+        if name == 'SECRET_KEY':
+            raise ImproperlyConfigured('The SECRET_KEY setting must be set.')
+        raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
+
     def is_overridden(self, setting):
         return setting in self._explicit_settings