Skip to content

Commit

Permalink
replace django.core.urlresolvers with django.urls to appeace Django2.… (
Browse files Browse the repository at this point in the history
#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
  • Loading branch information
s-wirth authored and kencochrane committed Dec 11, 2017
1 parent b2490e4 commit cde53c5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 4 additions & 1 deletion defender/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
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
Expand Down
5 changes: 4 additions & 1 deletion defender/views.py
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_package_data(package):
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'],
)

0 comments on commit cde53c5

Please sign in to comment.