From 180f2b85d6ec30bba56d682587da2b884f14e781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20Ha=CC=88kli?= <aleksi.hakli@iki.fi>
Date: Sat, 9 Mar 2019 21:27:18 +0200
Subject: [PATCH] Use django-appconf to 1.0.3+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New Django deprecates six usage and the new
django-appconf version offers six internally,
being compatible with new Django versions.

Signed-off-by: Aleksi Häkli <aleksi.hakli@iki.fi>
---
 axes/conf.py | 10 ----------
 setup.py     |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/axes/conf.py b/axes/conf.py
index 37875a0..5652088 100644
--- a/axes/conf.py
+++ b/axes/conf.py
@@ -1,13 +1,3 @@
-# TODO: Remove these imports after django-appconf does not depend on django.utils.six
-try:
-    from django.utils import six  # noqa
-except ImportError:  # pragma: no cover
-    import sys
-    import warnings
-
-    sys.modules['django.utils.six'] = __import__('six')
-    warnings.warn('django.utils.six was patched for django-appconf backwards compatibility', ImportWarning)
-
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
diff --git a/setup.py b/setup.py
index 73f4903..350cc24 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
     python_requires='~=3.5',
     install_requires=[
         'django',
-        'django-appconf',
+        'django-appconf>=1.0.3',
         'django-ipware>=2.0.2',
         'pytz',
         'six',