From 0f486ef6e4aa6787589bcb3043c019949cedc0cb Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Tue, 3 Dec 2019 11:52:00 +0100
Subject: [PATCH] Fix running on Django master.

This fixes an exception that was introduced upstream in https://github.com/django/django/commit/226ebb17290b604ef29e82fb5c1fbac3594ac163#diff-ec2bed07bb264cb95a80f08d71a47c06R163-R170
---
 configurations/base.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configurations/base.py b/configurations/base.py
index 1f38cf0..07f96df 100644
--- a/configurations/base.py
+++ b/configurations/base.py
@@ -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):