replace django.core.urlresolvers with django.urls to appeace Django2.… (#106)

* 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
This commit is contained in:
Sophie Wirth 2017-12-11 19:52:50 +01:00 committed by Ken Cochrane
parent b2490e4e4c
commit cde53c5315
3 changed files with 9 additions and 3 deletions

View file

@ -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

View file

@ -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)

View file

@ -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'],
)