Standardize CAS view names for django_cas_ng.

[audio.git] / src / audiobooks / urls.py

diff --git a/src/audiobooks/urls.py b/src/audiobooks/urls.py
index 792a50f..cd83905 100644 (file)
--- a/src/audiobooks/urls.py
+++ b/src/audiobooks/urls.py
@@ -1,19 +1,17 @@
-from django.conf import settings
-from django.conf.urls import include, url
+from django.contrib import admin
+from django.urls import include, path
 from django.views.generic import RedirectView
+from django.contrib import admin
 import django_cas_ng.views
 
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
 
 urlpatterns = [
-    url(r'^$', RedirectView.as_view(url='archive/', permanent=False)),
-    url(r'^archive/', include('archive.urls')),
-    url(r'^youtube/', include('youtube.urls')),
-    url(r'^publish/', include('apiclient.urls')),
+    path('', RedirectView.as_view(url='archive/', permanent=False)),
+    path('archive/', include('archive.urls')),
+    path('youtube/', include('youtube.urls')),
+    path('publish/', include('apiclient.urls')),
 
-    url(r'^admin/', admin.site.urls),
-    url(r'^accounts/login/$', django_cas_ng.views.LoginView.as_view(), name='login'),
-    url(r'^accounts/logout/$', django_cas_ng.views.LogoutView.as_view(), name='logout'),
+    path('admin/', admin.site.urls),
+    path('accounts/login/', django_cas_ng.views.LoginView.as_view(), name='cas_ng_login'),
+    path('accounts/logout/', django_cas_ng.views.LogoutView.as_view(), name='cas_ng_logout'),
 ]