diff --git a/dav_auth/urls.py b/dav_auth/urls.py index 8d4bdf7..f627fab 100644 --- a/dav_auth/urls.py +++ b/dav_auth/urls.py @@ -1,12 +1,12 @@ -from django.conf.urls import url +from django.urls import re_path from . import views app_name = 'dav_auth' urlpatterns = [ - url(r'^login$', views.LoginView.as_view(), name='login'), - url(r'^logout$', views.LogoutView.as_view(), name='logout'), - url(r'^password$', views.SetPasswordView.as_view(), name='set_password'), - url(r'^password/recreate$', views.CreateAndSendPasswordView.as_view(), name='recreate_password'), + re_path(r'^login$', views.LoginView.as_view(), name='login'), + re_path(r'^logout$', views.LogoutView.as_view(), name='logout'), + re_path(r'^password$', views.SetPasswordView.as_view(), name='set_password'), + re_path(r'^password/recreate$', views.CreateAndSendPasswordView.as_view(), name='recreate_password'), ] diff --git a/dav_base/config/modules.py b/dav_base/config/modules.py index 6c82e87..063a76e 100644 --- a/dav_base/config/modules.py +++ b/dav_base/config/modules.py @@ -3,7 +3,7 @@ import os import pkg_resources from django.conf import settings -from django.conf.urls import url as django_conf_url, include +from django.urls import re_path, include DJANGO_MAIN_MODULE = 'main' MODULE_CONFIG_FILE_NAME = 'module_config.json' @@ -50,7 +50,7 @@ class ModuleMeta: def url_conf_pattern(self): url_pattern = '^{}/'.format(self.url_prefix) url_conf = self._package_name + '.urls' - return django_conf_url(url_pattern, include(url_conf, self.url_namespace)) + return re_path(url_pattern, include(url_conf, self.url_namespace)) def _load_from_package(self): package_name = self._package_name diff --git a/dav_base/console_scripts/django_project_config/urls.py b/dav_base/console_scripts/django_project_config/urls.py index d1e9a66..23dec90 100644 --- a/dav_base/console_scripts/django_project_config/urls.py +++ b/dav_base/console_scripts/django_project_config/urls.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.conf.urls import url, include +from django.urls import re_path, include urlpatterns = [] @@ -8,5 +8,5 @@ for module_meta_obj in settings.MODULE_CONFIG.modules.values(): urlpatterns.append(module_meta_obj.url_conf_pattern) urlpatterns += [ - url(r'^', include('dav_base.urls')) + re_path(r'^', include('dav_base.urls')) ] diff --git a/dav_base/urls.py b/dav_base/urls.py index 5286e4e..30251a5 100644 --- a/dav_base/urls.py +++ b/dav_base/urls.py @@ -1,11 +1,11 @@ -from django.conf.urls import url +from django.urls import re_path from django.contrib import admin from django.views import generic from . import views urlpatterns = [ - url(r'^$', views.RootView.as_view(), name='root'), - url(r'^css-demo$', generic.TemplateView.as_view(template_name='dav_base/css_demo.html'), name='css-demo'), - url(r'^djangoadmin/', admin.site.urls), + re_path(r'^$', views.RootView.as_view(), name='root'), + re_path(r'^css-demo$', generic.TemplateView.as_view(template_name='dav_base/css_demo.html'), name='css-demo'), + re_path(r'^djangoadmin/', admin.site.urls), ] diff --git a/dav_event_office/urls.py b/dav_event_office/urls.py index 3def02d..6df768b 100644 --- a/dav_event_office/urls.py +++ b/dav_event_office/urls.py @@ -1,12 +1,12 @@ -from django.conf.urls import url +from django.urls import re_path from . import views app_name = 'dav_event_office' urlpatterns = [ - url(r'^home$', views.HomeView.as_view(), name='root'), - url(r'^participants$', views.ParticipantListView.as_view(), name='participant-list'), - url(r'^$', views.EventListView.as_view(), name='event-list'), - url(r'^(?P\d+)/', views.EventDetailView.as_view(), name='event-detail'), + re_path(r'^home$', views.HomeView.as_view(), name='root'), + re_path(r'^participants$', views.ParticipantListView.as_view(), name='participant-list'), + re_path(r'^$', views.EventListView.as_view(), name='event-list'), + re_path(r'^(?P\d+)/', views.EventDetailView.as_view(), name='event-detail'), ] diff --git a/dav_events/urls.py b/dav_events/urls.py index bef399c..6a414d1 100644 --- a/dav_events/urls.py +++ b/dav_events/urls.py @@ -1,20 +1,20 @@ -from django.conf.urls import url +from django.urls import re_path from . import views app_name = 'dav_events' urlpatterns = [ - url(r'^home$', views.base.HomeView.as_view(), name='root'), - url(r'^$', views.events.EventListView.as_view(), name='list'), - url(r'^export$', views.events.EventListExportView.as_view(), name='list_export'), - url(r'^create$', views.events.EventCreateView.as_view(), name='create'), - url(r'^(?P\d+)/registrations', views.events.EventRegistrationsView.as_view(), name='registrations'), - url(r'^(?P\d+)/status/(?P[a-z0-9._-][a-z0-9._-]*)', - views.events.EventUpdateStatusView.as_view(), name='updatestatus'), - url(r'^(?P\d+)/edit', views.events.EventUpdateView.as_view(), name='update'), - url(r'^(?P\d+)/', views.events.EventDetailView.as_view(), name='detail'), - url(r'^registration/(?P\d+)/', views.events.RespondRegistrationView.as_view(), name='respond_registration'), - url(r'^action/(?P[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})/', - views.actions.OneClickActionRunView.as_view(), name='action_run'), + re_path(r'^home$', views.base.HomeView.as_view(), name='root'), + re_path(r'^$', views.events.EventListView.as_view(), name='list'), + re_path(r'^export$', views.events.EventListExportView.as_view(), name='list_export'), + re_path(r'^create$', views.events.EventCreateView.as_view(), name='create'), + re_path(r'^(?P\d+)/registrations', views.events.EventRegistrationsView.as_view(), name='registrations'), + re_path(r'^(?P\d+)/status/(?P[a-z0-9._-][a-z0-9._-]*)', + views.events.EventUpdateStatusView.as_view(), name='updatestatus'), + re_path(r'^(?P\d+)/edit', views.events.EventUpdateView.as_view(), name='update'), + re_path(r'^(?P\d+)/', views.events.EventDetailView.as_view(), name='detail'), + re_path(r'^registration/(?P\d+)/', views.events.RespondRegistrationView.as_view(), name='respond_registration'), + re_path(r'^action/(?P[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})/', + views.actions.OneClickActionRunView.as_view(), name='action_run'), ] diff --git a/dav_registration/urls.py b/dav_registration/urls.py index d4999ad..c106cca 100644 --- a/dav_registration/urls.py +++ b/dav_registration/urls.py @@ -1,15 +1,15 @@ -from django.conf.urls import url +from django.urls import re_path from . import views app_name = 'dav_registration' urlpatterns = [ - url(r'^$', views.RootView.as_view(), name='root'), - url(r'^home/$', views.HomeView.as_view(), name='home'), - url(r'^event/$', views.EventListView.as_view(), name='events'), - url(r'^event/(?P\d+)/$', views.EventDetailView.as_view(), name='event'), - url(r'^event/(?P\d+)/registration/$', views.RegistrationView.as_view(), name='register'), - url(r'^finished/$', views.RegistrationSuccessView.as_view(), name='registered'), - url(r'^api/v1/event/$', views.EventListAsJSONView, name='api_events'), + re_path(r'^$', views.RootView.as_view(), name='root'), + re_path(r'^home/$', views.HomeView.as_view(), name='home'), + re_path(r'^event/$', views.EventListView.as_view(), name='events'), + re_path(r'^event/(?P\d+)/$', views.EventDetailView.as_view(), name='event'), + re_path(r'^event/(?P\d+)/registration/$', views.RegistrationView.as_view(), name='register'), + re_path(r'^finished/$', views.RegistrationSuccessView.as_view(), name='registered'), + re_path(r'^api/v1/event/$', views.EventListAsJSONView, name='api_events'), ]