Django 1.8

[cas.git] / src / cas / urls.py

diff --git a/src/cas/urls.py b/src/cas/urls.py
index 5b67eb1..9db4e41 100644 (file)
--- a/src/cas/urls.py
+++ b/src/cas/urls.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url

 from django.views.generic import RedirectView
 from django.contrib import admin
 from django.conf import settings
 
 admin.autodiscover()
 
 from django.views.generic import RedirectView
 from django.contrib import admin
 from django.conf import settings
 
 admin.autodiscover()
 

-urlpatterns = patterns('',
-    url(r'^$', RedirectView.as_view(url='/accounts/')),
+urlpatterns = [
+    url(r'^$', RedirectView.as_view(url='/accounts/', permanent=False)),

 
     # django-cas-provider
     url(r'^cas/', include('cas_provider.urls')),
 
     # django-cas-provider
     url(r'^cas/', include('cas_provider.urls')),


@@ -17,12 +17,13 @@ urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
 
     url(r'^accounts/', include('accounts.urls')),
     url(r'^admin/', include(admin.site.urls)),
 
     url(r'^accounts/', include('accounts.urls')),

-)
+]

 
 
 if settings.DEBUG:
 
 
 if settings.DEBUG:

-    urlpatterns += patterns('',
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+    from django.views.static import serve
+    urlpatterns += [
+        url(r'^media/(?P<path>.*)$', serve, {

             'document_root': settings.MEDIA_ROOT,
         }),
             'document_root': settings.MEDIA_ROOT,
         }),

-   )
+   ]