From 002f25f896db43e99ea6c8b2618d28ccf9cd6d25 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Mon, 3 Oct 2022 14:40:26 +0200
Subject: [PATCH 1/2] misc: apply django-upgrade (#69798)

---
 wcs/compat.py |  4 ++--
 wcs/urls.py   | 44 ++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/wcs/compat.py b/wcs/compat.py
index d37a88cf4..2ced96fea 100644
--- a/wcs/compat.py
+++ b/wcs/compat.py
@@ -62,7 +62,7 @@ class TemplateWithFallbackView(TemplateView):
             response = HttpResponse(body)
             response.status_code = self.quixote_response.status_code
             response.reason_phrase = self.quixote_response.reason_phrase
-        elif request.META.get('HTTP_X_POPUP') == 'true':
+        elif request.headers.get('X-Popup') == 'true':
             response = HttpResponse('<div class="popup-content">%s</div>' % context['body'])
         elif 'raw' in (getattr(self.quixote_response, 'filter') or {}):
             # used for theme preview (generated in /backoffice/ but cannot
@@ -143,7 +143,7 @@ class CompatWcsPublisher(WcsPublisher):
             return output
         if not hasattr(response, 'filter') or not response.filter:
             return output
-        if request.META.get('HTTP_X_POPUP') == 'true':
+        if request.headers.get('X-Popup') == 'true':
             return '<div class="popup-content">%s</div>' % output
         if response.filter and response.filter.get('admin_ezt'):
             return self.render_response(output)
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 <http://www.gnu.org/licenses/>.
 
-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<objects>[\w-]+)/$',
         api_export_import.objects_list,
         name='api-export-import-objects-list',
     ),
-    url(
+    re_path(
         r'^api/export-import/(?P<objects>[\w-]+)/(?P<slug>[\w_-]+)/$',
         api_export_import.object_export,
         name='api-export-import-object-export',
     ),
-    url(
+    re_path(
         r'^api/export-import/(?P<objects>[\w-]+)/(?P<slug>[\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