#46 #55 #56 Updated main urls to current Django syntax, removed SITE_URL that wasn't being used.

Author: jcaraballo17

src/odm2cvs/odm2cvs/urls.py

@@ -1,34 +1,31 @@
-from django.conf.urls import patterns, include, url
+from typing import List
+
+from django.urls import path, include, reverse_lazy
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.conf import settings
-from django.core.urlresolvers import reverse_lazy
-from cvinterface.views.base_views import UnitsListView
 
 from cvservices.api import v1_api
+from cvinterface.views.base_views import UnitsListView
 
 from cvinterface.controlled_vocabularies import requests
 from cvinterface.views.vocabulary_views import VocabulariesView, list_views, detail_views
 from cvinterface.views.request_views import RequestsView, \
     request_list_views, request_create_views, request_update_views
 
-login_configuration = {
-    'template_name': 'cvinterface/account/login.html',
-    'redirect_field_name': 'next'
-}
-
-logout_configuration = {
-    'next_page': reverse_lazy('home')
-}
-
-urlpatterns = [
-    url(r'^' + settings.SITE_URL + '$', VocabulariesView.as_view(), name='home'),
-    url(r'^' + settings.SITE_URL + 'api/', include(v1_api.urls)),
-    url(r'^' + settings.SITE_URL + 'admin/', include(admin.site.urls)),
-    url(r'^' + settings.SITE_URL + 'units/', UnitsListView.as_view(), name='units'),
-    url(r'^' + settings.SITE_URL + 'requests/$', RequestsView.as_view(), name='requests_list'),
-    url(r'^' + settings.SITE_URL + 'login/$', auth_views.login, login_configuration, name='login'),
-    url(r'^' + settings.SITE_URL + 'logout/$', auth_views.logout, logout_configuration, name='logout'),
+
+urlpatterns: List[path] = [
+    path('', VocabulariesView.as_view(), name='home'),
+    path('api/', include(v1_api.urls)),
+    path('admin/', include(admin.site.urls)),
+    path('units/', UnitsListView.as_view(), name='units'),
+    path('requests/', RequestsView.as_view(), name='requests_list'),
+    path('accounts/', include('django.contrib.auth.urls')),
+    path('accounts/login/', auth_views.LoginView.as_view(
+        template_name='cvinterface/account/login.html',
+        redirect_field_name='next'),
+         name='login'),
+    path('accounts/logout/', auth_views.LogoutView.as_view(next_page= reverse_lazy('home')), name='logout'),
 ]
 
 
@@ -37,18 +34,18 @@
     view = list_views[cv_name]
 
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + cv_name + '/$', view, name=cv_name),
+        path(r'^' + settings.SITE_URL + cv_name + '/$', view, name=cv_name),
     ]
 
 # cv detail views
 for cv_name in detail_views:
     view = detail_views[cv_name]
 
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + cv_name + '/(?P<slug>[-\w]+)/(?P<pk>[-\w]+)/$', view, name=cv_name + '_detail'),
+        path(r'^' + settings.SITE_URL + cv_name + '/(?P<slug>[-\w]+)/(?P<pk>[-\w]+)/$', view, name=cv_name + '_detail'),
     ]
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + cv_name + '/(?P<slug>[-\w]+)/$', view, name=cv_name + '_detail'),
+        path(r'^' + settings.SITE_URL + cv_name + '/(?P<slug>[-\w]+)/$', view, name=cv_name + '_detail'),
     ]
 
 
@@ -57,17 +54,17 @@
     view = request_list_views[request_name]
 
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/$', view,
+        path(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/$', view,
             name=request_name),
     ]
 
 # request create views
 for request_name in request_create_views:
     view = request_create_views[request_name]
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/new/$', view,
+        path(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/new/$', view,
             name=requests[request_name]['vocabulary'] + '_form'),
-        url(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/new/(?P<vocabulary_id>[\w]+)/$',
+        path(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/new/(?P<vocabulary_id>[\w]+)/$',
             view, name=requests[request_name]['vocabulary'] + '_form'),
     ]
 
@@ -76,6 +73,6 @@
     view = request_update_views[request_name]
 
     urlpatterns += [
-        url(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/(?P<pk>[-\w]+)/$', view,
+        path(r'^' + settings.SITE_URL + 'requests/' + requests[request_name]['vocabulary'] + '/(?P<pk>[-\w]+)/$', view,
             name=requests[request_name]['vocabulary'] + '_update_form'),
     ]