diff --git a/CHANGES b/CHANGES index d23bb4b..4e3e973 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +* convert to Django 1.10 compatible urls.py + 0.15.0 (2016-06-06) =================== diff --git a/djangowind/urls.py b/djangowind/urls.py index 671a634..c4359ca 100644 --- a/djangowind/urls.py +++ b/djangowind/urls.py @@ -1,23 +1,24 @@ from __future__ import unicode_literals -from django.conf.urls import patterns +from django.conf.urls import url +from .views import ( + login, windlogin, caslogin, logout, +) +from django.contrib.auth.views import ( + logout_then_login, redirect_to_login, password_reset, + password_reset_done, password_change, password_change_done, +) -urlpatterns = patterns('', - (r'^login/$', 'djangowind.views.login'), - (r'^windlogin/$', 'djangowind.views.windlogin'), - (r'^caslogin/$', 'djangowind.views.caslogin', - {}, 'cas-login'), - (r'^logout/$', 'djangowind.views.logout'), - (r'^logout_then_login/$', - 'django.contrib.auth.views.logout_then_login'), - (r'^redirect_to_login/$', - 'django.contrib.auth.views.redirect_to_login'), - (r'^password_reset/$', - 'django.contrib.auth.views.password_reset'), - (r'^password_reset_done/$', - 'django.contrib.auth.views.password_reset_done'), - (r'^password_change/$', - 'django.contrib.auth.views.password_change'), - (r'^password_change_done/$', - 'django.contrib.auth.views.password_change_done') - ) +urlpatterns = [ + url(r'^login/$', login), + url(r'^windlogin/$', windlogin), + url(r'^caslogin/$', caslogin, {}, 'cas-login'), + url(r'^logout/$', logout), + + url(r'^logout_then_login/$', logout_then_login), + url(r'^redirect_to_login/$', redirect_to_login), + url(r'^password_reset/$', password_reset), + url(r'^password_reset_done/$', password_reset_done), + url(r'^password_change/$', password_change), + url(r'^password_change_done/$', password_change_done), +]