From a5e85fe034cb8b8db5d6a695579cb87127df2390 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 3 Oct 2022 17:53:32 +0200 Subject: [PATCH 2/3] misc: apply django-upgrade (#69798) --- wcs/urls.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/wcs/urls.py b/wcs/urls.py index da6375cc8..539f17a10 100644 --- a/wcs/urls.py +++ b/wcs/urls.py @@ -14,53 +14,53 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from django.conf.urls import url +from django.urls import path, re_path from . import api, api_export_import, compat, views from .statistics import views as statistics_views urlpatterns = [ - url(r'^robots.txt$', views.robots_txt), - url(r'^i18n\.js$', views.i18n_js), - url(r'^backoffice/', views.backoffice), - url(r'^__provision__/$', api.provisionning), - url(r'^api/export-import/$', api_export_import.index, name='api-export-import'), - url(r'^api/export-import/bundle-import/$', api_export_import.bundle_import), - url( + re_path(r'^robots.txt$', views.robots_txt), + re_path(r'^i18n\.js$', views.i18n_js), + re_path(r'^backoffice/', views.backoffice), + path('__provision__/', api.provisionning), + path('api/export-import/', api_export_import.index, name='api-export-import'), + path('api/export-import/bundle-import/', api_export_import.bundle_import), + re_path( r'^api/export-import/(?P[\w-]+)/$', api_export_import.objects_list, name='api-export-import-objects-list', ), - url( + re_path( r'^api/export-import/(?P[\w-]+)/(?P[\w_-]+)/$', api_export_import.object_export, name='api-export-import-object-export', ), - url( + re_path( r'^api/export-import/(?P[\w-]+)/(?P[\w_-]+)/dependencies/$', api_export_import.object_dependencies, name='api-export-import-object-dependencies', ), - url(r'^api/validate-condition$', api.validate_condition, name='api-validate-condition'), - url(r'^api/validate-expression$', api.validate_expression, name='api-validate-expression'), - url(r'^api/reverse-geocoding$', api.reverse_geocoding, name='api-reverse-geocoding'), - url(r'^api/geocoding$', api.geocoding, name='api-geocoding'), - url(r'^api/statistics/$', statistics_views.IndexView.as_view()), - url( - r'^api/statistics/forms/count/$', + path('api/validate-condition', api.validate_condition, name='api-validate-condition'), + path('api/validate-expression', api.validate_expression, name='api-validate-expression'), + path('api/reverse-geocoding', api.reverse_geocoding, name='api-reverse-geocoding'), + path('api/geocoding', api.geocoding, name='api-geocoding'), + path('api/statistics/', statistics_views.IndexView.as_view()), + path( + 'api/statistics/forms/count/', statistics_views.FormsCountView.as_view(), name='api-statistics-forms-count', ), - url( - r'^api/statistics/cards/count/$', + path( + 'api/statistics/cards/count/', statistics_views.CardsCountView.as_view(), name='api-statistics-cards-count', ), # provide django.contrib.auth view names for compatibility with # templates created for classic django applications. - url(r'^login/$', compat.quixote, name='auth_login'), - url(r'^logout$', compat.quixote, name='auth_logout'), + path('login/', compat.quixote, name='auth_login'), + path('logout', compat.quixote, name='auth_logout'), ] # other URLs are handled by the quixote handler -urlpatterns.append(url(r'', compat.quixote, name='quixote')) +urlpatterns.append(re_path(r'', compat.quixote, name='quixote')) -- 2.35.1