♻️ django 3.2 deprecation: url -> re_path ; ugettext_lazy -> gettext_lazy

1 files changed, 35 insertions, 36 deletions

diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index 25d1186a0..11e4c8ff0 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -17,8 +17,7 @@
 
 # See the file COPYING for details.
 
-from django.conf.urls import url
-from django.urls import path
+from django.urls import path, re_path
 
 from ishtar_common.utils import check_permissions
 from ishtar_common.views import QALinkView
@@ -29,13 +28,13 @@ from archaeological_operations.views import administrativeactfile_document
 
 # forms:
 urlpatterns = [
-    url(
+    re_path(
         r"^file-qa-link/(?P<pks>[0-9-]+)?/$",
         QALinkView.as_view(),
         name="file-qa-link",
         kwargs={"model": models.File, "url": "file-qa-link"},
     ),
-    url(
+    re_path(
         r"file_administrativeactfile_search/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.view_administrativeact",
@@ -44,7 +43,7 @@ urlpatterns = [
         ),
         name="file_administrativeactfile_search",
     ),
-    url(
+    re_path(
         r"^file_administrativeactfile/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.add_administrativeact"])(
@@ -52,12 +51,12 @@ urlpatterns = [
         ),
         name="file_administrativeactfile",
     ),
-    url(
+    re_path(
         r"file_administrativeactfile_modify/(?P<pk>.+)/$",
         views.file_administrativeactfile_modify,
         name="file_administrativeactfile_modify",
     ),
-    url(
+    re_path(
         r"file_administrativeactfile_deletion/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.delete_administrativeact",
@@ -66,7 +65,7 @@ urlpatterns = [
         ),
         name="file_administrativeactfile_deletion",
     ),
-    url(
+    re_path(
         r"file_administrativeactfile_modification/(?P<step>.+)?$",
         check_permissions([
             "archaeological_operations.change_administrativeact",
@@ -75,24 +74,24 @@ urlpatterns = [
         ),
         name="file_administrativeactfile_modification",
     ),
-    url(
+    re_path(
         r"file_administrativeactfile_delete/(?P<pk>.+)/$",
         views.file_administrativeact_delete,
         name="delete-administrativeact-file",
     ),
-    url(
+    re_path(
         r"file_search/(?P<step>.+)?$",
         check_permissions([
             "archaeological_files.view_file",
             "archaeological_files.view_own_file"])(views.file_search_wizard),
         name="file_search",
     ),
-    url(
+    re_path(
         r"^file_creation/(?P<step>.+)?$",
         check_permissions(["archaeological_files.add_file"])(views.file_creation_wizard),
         name="file_creation",
     ),
-    url(
+    re_path(
         r"^file_modification/(?P<step>.+)?$",
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -100,8 +99,8 @@ urlpatterns = [
         ),
         name="file_modification",
     ),
-    url(r"^file_modify/(?P<pk>.+)/$", views.file_modify, name="file_modify"),
-    url(
+    re_path(r"^file_modify/(?P<pk>.+)/$", views.file_modify, name="file_modify"),
+    re_path(
         r"^file_closing/(?P<step>.+)?$",
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -109,61 +108,61 @@ urlpatterns = [
         ),
         name="file_closing",
     ),
-    url(
+    re_path(
         r"file_deletion/(?P<step>.+)?$",
         check_permissions(
             ["archaeological_files.delete_file", "archaeological_files.delete_own_file"]
         )(views.file_deletion_wizard),
         name="file_deletion",
     ),
-    url(r"^file_delete/(?P<pk>.+)/$", views.file_delete, name="delete-file"),
-    url(r"autocomplete-file/$", views.autocomplete_file, name="autocomplete-file"),
-    url(r"get-file/(?P<type>.+)?$", views.get_file, name="get-file"),
-    url(
+    re_path(r"^file_delete/(?P<pk>.+)/$", views.file_delete, name="delete-file"),
+    re_path(r"autocomplete-file/$", views.autocomplete_file, name="autocomplete-file"),
+    re_path(r"get-file/(?P<type>.+)?$", views.get_file, name="get-file"),
+    re_path(
         r"get-file-full/(?P<type>.+)?$",
         views.get_file,
         name="get-file-full",
         kwargs={"full": True},
     ),
-    url(
+    re_path(
         r"get-file-shortcut/(?P<type>.+)?$",
         views.get_file,
         name="get-file-shortcut",
         kwargs={"full": "shortcut"},
     ),
-    url(
+    re_path(
         r"get-administrativeactfile/(?P<type>.+)?$",
         views.get_administrativeactfile,
         name="get-administrativeactfile",
     ),
-    url(r"show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_file, name="show-file"),
-    url(
+    re_path(r"show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$", views.show_file, name="show-file"),
+    re_path(
         r"show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$",
         views.show_file,
         name="show-historized-file",
     ),
-    url(r"revert-file/(?P<pk>.+)/(?P<date>.+)$", views.revert_file, name="revert-file"),
-    url(
+    re_path(r"revert-file/(?P<pk>.+)/(?P<date>.+)$", views.revert_file, name="revert-file"),
+    re_path(
         r"^file-add-adminact/(?P<pk>[0-9-]+)/$",
         check_permissions(["archaeological_operations.add_administrativeact"])(
             views.file_adminact_add
         ),
         name="file-add-adminact",
     ),
-    url(
+    re_path(
         r"file_administrativeact_document/$",
         administrativeactfile_document,
         name="file-administrativeact-document",
         kwargs={"file": True},
     ),
-    url(
+    re_path(
         r"^file-add-operation/(?P<pk>[0-9-]+)/$",
         check_permissions(["archaeological_operations.add_operation"])(
             views.file_add_operation
         ),
         name="file-add-operation",
     ),
-    url(
+    re_path(
         r'^file/edit-preventive-price/(?P<pk>\d+)/$',
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -171,12 +170,12 @@ urlpatterns = [
         ),
         name="file-edit-preventive-price",
     ),
-    url(
+    re_path(
         r"^file-parcels-modify/(?P<pk>.+)/$",
         views.file_modify_parcels,
         name="file-parcels-modify",
     ),
-    url(
+    re_path(
         r'^file/edit-preventive/(?P<pk>\d+)/$',
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -184,7 +183,7 @@ urlpatterns = [
         ),
         name="file-edit-preventive",
     ),
-    url(
+    re_path(
         r'^file/edit-preventive/add-default-cost/(?P<pk>\d+)/$',
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -192,7 +191,7 @@ urlpatterns = [
         ),
         name="file-edit-preventive-default-cost",
     ),
-    url(
+    re_path(
         r'^file/edit-preventive/copy-planned/(?P<pk>\d+)/$',
         check_permissions(["archaeological_files.change_file",
                            "archaeological_files.change_own_file"])(
@@ -200,21 +199,21 @@ urlpatterns = [
         ),
         name="file-edit-preventive-copy-planned",
     ),
-    url(
+    re_path(
         r"townplanning-edit/$",
         views.TownPlanningCreate.as_view(),
         name="townplanning_create",
     ),
-    url(
+    re_path(
         r"townplanning-edit/(?P<pk>\d+)$",
         views.TownPlanningEdit.as_view(),
         name="townplanning_edit",
     ),
-    url(
+    re_path(
         r"api/facets/file/$", views_api.FacetFileAPIView.as_view(),
         name="api-facets-file"
     ),
-    url(
+    re_path(
         r"api/search/file/$", views_api.SearchFileAPI.as_view(),
         name="api-search-file"
     ),