Merge branch 'elep'

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

diff --git a/cas_provider/urls.py b/cas_provider/urls.py
index 22f3dc7..fb59599 100644 (file)
--- a/cas_provider/urls.py
+++ b/cas_provider/urls.py
@@ -1,10 +1,12 @@
-from django.conf.urls.defaults import patterns, url
+from __future__ import unicode_literals
+
+from django.conf.urls import patterns, url

 
 
 urlpatterns = patterns('cas_provider.views',
     url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'}),
     url(r'^login/?$', 'login', name='cas_login'),
 
 
 urlpatterns = patterns('cas_provider.views',
     url(r'^login/merge/', 'login', {'merge': True, 'template_name': 'cas/merge.html'}),
     url(r'^login/?$', 'login', name='cas_login'),

-    url(r'^socialauth-login/$', 'socialauth_login', name='cas_socialauth_login'),
+    url(r'^socialauth-login/$', 'login', name='cas_socialauth_login'),

     url(r'^validate/?$', 'validate', name='cas_validate'),
     url(r'^proxy/?$', 'proxy', name='proxy'),
     url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),
     url(r'^validate/?$', 'validate', name='cas_validate'),
     url(r'^proxy/?$', 'proxy', name='proxy'),
     url(r'^serviceValidate/?$', 'service_validate', name='cas_service_validate'),