From cde53c53157355d40cdcd3681b33782b1728eff0 Mon Sep 17 00:00:00 2001
From: Sophie Wirth <a.sophiewirth@gmail.com>
Date: Mon, 11 Dec 2017 19:52:50 +0100
Subject: [PATCH] =?UTF-8?q?replace=20django.core.urlresolvers=20with=20dja?=
 =?UTF-8?q?ngo.urls=20to=20appeace=20Django2.=E2=80=A6=20(#106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* replace django.core.urlresolvers with django.urls to appeace Django2.0 deprecations
* add try except block around imports for older version support
* add correct django version in setup.py install_reqs
---
 defender/tests.py | 5 ++++-
 defender/views.py | 5 ++++-
 setup.py          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/defender/tests.py b/defender/tests.py
index 18a7475..a3f5a8b 100644
--- a/defender/tests.py
+++ b/defender/tests.py
@@ -13,10 +13,13 @@ from django import get_version
 from django.contrib.auth.models import User
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.sessions.backends.db import SessionStore
-from django.core.urlresolvers import reverse
 from django.http import HttpRequest, HttpResponse
 from django.test.client import RequestFactory
 from redis.client import Redis
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from . import utils
 from . import config
diff --git a/defender/views.py b/defender/views.py
index ba46abc..3c3e4af 100644
--- a/defender/views.py
+++ b/defender/views.py
@@ -1,7 +1,10 @@
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
 from django.contrib.admin.views.decorators import staff_member_required
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from .utils import (
     get_blocked_ips, get_blocked_usernames, unblock_ip, unblock_username)
diff --git a/setup.py b/setup.py
index b9c8f7c..76a4bb5 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ setup(name='django-defender',
       include_package_data=True,
       packages=get_packages('defender'),
       package_data=get_package_data('defender'),
-      install_requires=['Django>=1.8,<1.12', 'redis>=2.10.3,<3.0',
+      install_requires=['Django>=1.8,<2.1', 'redis>=2.10.3,<3.0',
                         'mockredispy>=2.9.0.11,<3.0'],
       tests_require=['mock', 'mockredispy', 'coverage', 'celery', 'django-redis-cache'],
       )