Fix running on Django master.

This fixes an exception that was introduced upstream in 226ebb1729 (diff-ec2bed07bb264cb95a80f08d71a47c06R163-R170)
This commit is contained in:
Jannis Leidel 2019-12-03 11:52:00 +01:00
parent 843271a701
commit 0f486ef6e4
No known key found for this signature in database
GPG key ID: C795956FB489DCA9

View file

@ -33,6 +33,10 @@ class ConfigurationBase(type):
for base in bases[::-1]:
settings_vars.update(uppercase_attributes(base))
attrs = dict(settings_vars, **attrs)
# Fix ImproperlyConfigured issue introduced in Django
# https://github.com/django/django/commit/226ebb17290b604ef29e82fb5c1fbac3594ac163#diff-ec2bed07bb264cb95a80f08d71a47c06R163-R170
if "PASSWORD_RESET_TIMEOUT_DAYS" in attrs and "PASSWORD_RESET_TIMEOUT" in attrs:
attrs.pop("PASSWORD_RESET_TIMEOUT_DAYS")
return super(ConfigurationBase, cls).__new__(cls, name, bases, attrs)
def __repr__(self):