Django 1.8(b2) support.

[django-cas-provider.git] / cas_provider / urls.py

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 16a6744..f679a87 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,9 +1,16 @@
-from django.conf.urls.defaults import patterns, url
+from __future__ import unicode_literals
 
+from django.conf.urls import url
+from cas_provider import views
 
-urlpatterns = patterns('cas_provider.views',
-    url(r'^login/?$', 'login', name='cas_login'),
-    url(r'^validate/?$', 'validate', name='cas_validate'),
-    url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),
-    url(r'^logout/?$', 'logout', name='cas_logout'),
-)
+
+urlpatterns = [
+    url(r'^login/merge/', views.login, {'merge': True, 'template_name': 'cas/merge.html'}),
+    url(r'^login/?$', views.login, name='cas_login'),
+    url(r'^socialauth-login/$', views.login, name='cas_socialauth_login'),
+    url(r'^validate/?$', views.validate, name='cas_validate'),
+    url(r'^proxy/?$', views.proxy, name='proxy'),
+    url(r'^serviceValidate/?$', views.service_validate, name='cas_service_validate'),
+    url(r'^proxyValidate/?$', views.proxy_validate, name='cas_proxy_validate'),
+    url(r'^logout/?$', views.logout, name='cas_logout'),
+]