Nicer for admin.

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

diff --git a/src/cas/urls.py b/src/cas/urls.py
index 9db4e41..abe01e8 100644 (file)
--- a/src/cas/urls.py
+++ b/src/cas/urls.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from django.conf.urls import include, url
+from django.urls import path, include

 from django.views.generic import RedirectView
 from django.contrib import admin
 from django.conf import settings
 from django.views.generic import RedirectView
 from django.contrib import admin
 from django.conf import settings


@@ -7,23 +6,26 @@ from django.conf import settings
 admin.autodiscover()
 
 urlpatterns = [
 admin.autodiscover()
 
 urlpatterns = [

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

 
     # django-cas-provider
 
     # django-cas-provider

-    url(r'^cas/', include('cas_provider.urls')),
+    path('cas/', include('cas_provider.urls')),

 
     # Admin panel
 
     # Admin panel

-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', include(admin.site.urls)),
+    path('admin/doc/', include('django.contrib.admindocs.urls')),
+    path('admin/', admin.site.urls),

 
 

-    url(r'^accounts/', include('accounts.urls')),
+    path('accounts/', include('accounts.urls')),
+    path('services/', include('services.urls')),
+    path('ssh/', include('ssh_keys.urls')),
+    path('auth/', include('django.contrib.auth.urls')),

 ]
 
 
 if settings.DEBUG:
     from django.views.static import serve
     urlpatterns += [
 ]
 
 
 if settings.DEBUG:
     from django.views.static import serve
     urlpatterns += [

-        url(r'^media/(?P<path>.*)$', serve, {
+        path('media/<path>', serve, {

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