summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
authororlnub123 <orlnub123@gmail.com>2019-03-03 03:23:18 +0300
committerTim Graham <timograham@gmail.com>2019-03-05 09:52:08 -0500
commit163236ea0e5df1a301371e79ec35fc67b7a1b7a6 (patch)
tree94a199d0bb179db36485a8ecbe370550122102f6 /django/conf/__init__.py
parent9681e968ebdcd58cac99c1e60f0a6932abd4e5c9 (diff)
downloaddjango-163236ea0e5df1a301371e79ec35fc67b7a1b7a6.tar.gz
Fixed #30234 -- Disallowed non-upper settings in settings.configure().
Diffstat (limited to 'django/conf/__init__.py')
-rw-r--r--django/conf/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 608ad256dc..3337fd6f13 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -104,6 +104,8 @@ class LazySettings(LazyObject):
raise RuntimeError('Settings already configured.')
holder = UserSettingsHolder(default_settings)
for name, value in options.items():
+ if not name.isupper():
+ raise TypeError('Setting %r must be uppercase.' % name)
setattr(holder, name, value)
self._wrapped = holder
@@ -198,7 +200,7 @@ class UserSettingsHolder:
self.default_settings = default_settings
def __getattr__(self, name):
- if name in self._deleted:
+ if not name.isupper() or name in self._deleted:
raise AttributeError
return getattr(self.default_settings, name)