wagtail 6.2.1__py3-none-any.whl → 6.3rc1__py3-none-any.whl

wagtail/contrib/frontend_cache/backends/cloudfront.py

@@ -45,7 +45,7 @@ class CloudfrontBackend(BaseBackend):
                 self.hostnames = list(self.cloudfront_distribution_id.keys())
 
     def purge_batch(self, urls):
-        paths_by_distribution_id = defaultdict(list)
+        paths_by_distribution_id = defaultdict(set)
 
         for url in urls:
             url_parsed = urlparse(url)
@@ -69,7 +69,7 @@ class CloudfrontBackend(BaseBackend):
                 distribution_id = self.cloudfront_distribution_id
 
             if distribution_id:
-                paths_by_distribution_id[distribution_id].append(url_parsed.path)
+                paths_by_distribution_id[distribution_id].add(url_parsed.path)
 
         for distribution_id, paths in paths_by_distribution_id.items():
             self._create_invalidation(distribution_id, paths)

wagtail/contrib/frontend_cache/backends/dummy.py

@@ -0,0 +1,11 @@
+from .base import BaseBackend
+
+
+class DummyBackend(BaseBackend):
+    def __init__(self):
+        super().__init__()
+
+        self.urls = []
+
+    def purge(self, url) -> None:
+        self.urls.append(url)

wagtail/contrib/frontend_cache/tests.py

@@ -360,7 +360,7 @@ class TestBackendConfiguration(SimpleTestCase):
             backends.get("cloudfront").purge("http://torchbox.com/blog/")
 
         _create_invalidation.assert_called_once_with(
-            "frontend", ["/home/events/christmas/"]
+            "frontend", {"/home/events/christmas/"}
         )
 
         self.assertTrue(
@@ -417,12 +417,12 @@ class TestBackendConfiguration(SimpleTestCase):
         self.assertEqual(backends["default"].cache_netloc, "localhost:8000")
 
 
-PURGED_URLS = []
+PURGED_URLS = set()
 
 
 class MockBackend(BaseBackend):
     def purge(self, url):
-        PURGED_URLS.append(url)
+        PURGED_URLS.add(url)
 
 
 class MockCloudflareBackend(CloudflareBackend):
@@ -430,7 +430,7 @@ class MockCloudflareBackend(CloudflareBackend):
         if len(urls) > self.CHUNK_SIZE:
             raise Exception("Cloudflare backend is not chunking requests as expected")
 
-        PURGED_URLS.extend(urls)
+        PURGED_URLS.update(urls)
 
 
 @override_settings(
@@ -444,28 +444,27 @@ class TestCachePurgingFunctions(TestCase):
     fixtures = ["test.json"]
 
     def setUp(self):
-        # Reset PURGED_URLS to an empty list
-        PURGED_URLS[:] = []
+        PURGED_URLS.clear()
 
     def test_purge_url_from_cache(self):
         purge_url_from_cache("http://localhost/foo")
-        self.assertEqual(PURGED_URLS, ["http://localhost/foo"])
+        self.assertEqual(PURGED_URLS, {"http://localhost/foo"})
 
     def test_purge_urls_from_cache(self):
         purge_urls_from_cache(["http://localhost/foo", "http://localhost/bar"])
-        self.assertEqual(PURGED_URLS, ["http://localhost/foo", "http://localhost/bar"])
+        self.assertEqual(PURGED_URLS, {"http://localhost/foo", "http://localhost/bar"})
 
     def test_purge_page_from_cache(self):
         page = EventIndex.objects.get(url_path="/home/events/")
         purge_page_from_cache(page)
         self.assertEqual(
-            PURGED_URLS, ["http://localhost/events/", "http://localhost/events/past/"]
+            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_pages_from_cache(self):
         purge_pages_from_cache(EventIndex.objects.all())
         self.assertEqual(
-            PURGED_URLS, ["http://localhost/events/", "http://localhost/events/past/"]
+            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_batch(self):
@@ -477,11 +476,11 @@ class TestCachePurgingFunctions(TestCase):
 
         self.assertEqual(
             PURGED_URLS,
-            [
+            {
                 "http://localhost/events/",
                 "http://localhost/events/past/",
                 "http://localhost/foo",
-            ],
+            },
         )
 
     @override_settings(
@@ -496,14 +495,14 @@ class TestCachePurgingFunctions(TestCase):
         with self.assertLogs(level="INFO") as log_output:
             purge_url_from_cache("http://localhost/foo")
 
-        self.assertEqual(PURGED_URLS, [])
+        self.assertEqual(PURGED_URLS, set())
         self.assertIn(
             "Unable to find purge backend for localhost",
             log_output.output[0],
         )
 
         purge_url_from_cache("http://example.com/foo")
-        self.assertEqual(PURGED_URLS, ["http://example.com/foo"])
+        self.assertEqual(PURGED_URLS, {"http://example.com/foo"})
 
 
 @override_settings(
@@ -518,7 +517,7 @@ class TestCachePurgingFunctions(TestCase):
 class TestCloudflareCachePurgingFunctions(TestCase):
     def setUp(self):
         # Reset PURGED_URLS to an empty list
-        PURGED_URLS[:] = []
+        PURGED_URLS.clear()
 
     def test_cloudflare_purge_batch_chunked(self):
         batch = PurgeBatch()
@@ -526,7 +525,7 @@ class TestCloudflareCachePurgingFunctions(TestCase):
         batch.add_urls(urls)
         batch.purge()
 
-        self.assertCountEqual(PURGED_URLS, urls)
+        self.assertCountEqual(PURGED_URLS, set(urls))
 
 
 @override_settings(
@@ -541,20 +540,20 @@ class TestCachePurgingSignals(TestCase):
 
     def setUp(self):
         # Reset PURGED_URLS to an empty list
-        PURGED_URLS[:] = []
+        PURGED_URLS.clear()
 
     def test_purge_on_publish(self):
         page = EventIndex.objects.get(url_path="/home/events/")
         page.save_revision().publish()
         self.assertEqual(
-            PURGED_URLS, ["http://localhost/events/", "http://localhost/events/past/"]
+            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_on_unpublish(self):
         page = EventIndex.objects.get(url_path="/home/events/")
         page.unpublish()
         self.assertEqual(
-            PURGED_URLS, ["http://localhost/events/", "http://localhost/events/past/"]
+            PURGED_URLS, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_purge_with_unroutable_page(self):
@@ -562,7 +561,7 @@ class TestCachePurgingSignals(TestCase):
         page = EventIndex(title="new top-level page")
         root.add_child(instance=page)
         page.save_revision().publish()
-        self.assertEqual(PURGED_URLS, [])
+        self.assertEqual(PURGED_URLS, set())
 
     @override_settings(
         ROOT_URLCONF="wagtail.test.urls_multilang",
@@ -570,20 +569,19 @@ class TestCachePurgingSignals(TestCase):
         WAGTAILFRONTENDCACHE_LANGUAGES=["en", "fr", "pt-br"],
     )
     def test_purge_on_publish_in_multilang_env(self):
-        PURGED_URLS[:] = []  # reset PURGED_URLS to the empty list
         page = EventIndex.objects.get(url_path="/home/events/")
         page.save_revision().publish()
 
         self.assertEqual(
             PURGED_URLS,
-            [
+            {
                 "http://localhost/en/events/",
                 "http://localhost/en/events/past/",
                 "http://localhost/fr/events/",
                 "http://localhost/fr/events/past/",
                 "http://localhost/pt-br/events/",
                 "http://localhost/pt-br/events/past/",
-            ],
+            },
         )
 
     @override_settings(
@@ -593,18 +591,17 @@ class TestCachePurgingSignals(TestCase):
         WAGTAIL_CONTENT_LANGUAGES=[("en", "English"), ("fr", "French")],
     )
     def test_purge_on_publish_with_i18n_enabled(self):
-        PURGED_URLS[:] = []  # reset PURGED_URLS to the empty list
         page = EventIndex.objects.get(url_path="/home/events/")
         page.save_revision().publish()
 
         self.assertEqual(
             PURGED_URLS,
-            [
+            {
                 "http://localhost/en/events/",
                 "http://localhost/en/events/past/",
                 "http://localhost/fr/events/",
                 "http://localhost/fr/events/past/",
-            ],
+            },
         )
 
     @override_settings(
@@ -614,12 +611,11 @@ class TestCachePurgingSignals(TestCase):
     )
     def test_purge_on_publish_without_i18n_enabled(self):
         # It should ignore WAGTAIL_CONTENT_LANGUAGES as WAGTAIL_I18N_ENABLED isn't set
-        PURGED_URLS[:] = []  # reset PURGED_URLS to the empty list
         page = EventIndex.objects.get(url_path="/home/events/")
         page.save_revision().publish()
         self.assertEqual(
             PURGED_URLS,
-            ["http://localhost/en/events/", "http://localhost/en/events/past/"],
+            {"http://localhost/en/events/", "http://localhost/en/events/past/"},
         )
 
 
@@ -633,13 +629,13 @@ class TestPurgeBatchClass(TestCase):
         batch = PurgeBatch()
         batch.add_url("http://localhost/foo")
 
-        self.assertEqual(batch.urls, ["http://localhost/foo"])
+        self.assertEqual(batch.urls, {"http://localhost/foo"})
 
     def test_add_urls(self):
         batch = PurgeBatch()
         batch.add_urls(["http://localhost/foo", "http://localhost/bar"])
 
-        self.assertEqual(batch.urls, ["http://localhost/foo", "http://localhost/bar"])
+        self.assertEqual(batch.urls, {"http://localhost/foo", "http://localhost/bar"})
 
     def test_add_page(self):
         page = EventIndex.objects.get(url_path="/home/events/")
@@ -648,7 +644,7 @@ class TestPurgeBatchClass(TestCase):
         batch.add_page(page)
 
         self.assertEqual(
-            batch.urls, ["http://localhost/events/", "http://localhost/events/past/"]
+            batch.urls, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_add_pages(self):
@@ -656,7 +652,7 @@ class TestPurgeBatchClass(TestCase):
         batch.add_pages(EventIndex.objects.all())
 
         self.assertEqual(
-            batch.urls, ["http://localhost/events/", "http://localhost/events/past/"]
+            batch.urls, {"http://localhost/events/", "http://localhost/events/past/"}
         )
 
     def test_multiple_calls(self):
@@ -669,11 +665,11 @@ class TestPurgeBatchClass(TestCase):
 
         self.assertEqual(
             batch.urls,
-            [
+            {
                 "http://localhost/events/",
                 "http://localhost/events/past/",
                 "http://localhost/foo",
-            ],
+            },
         )
 
     @mock.patch("wagtail.contrib.frontend_cache.backends.cloudflare.requests.delete")
@@ -696,10 +692,8 @@ class TestPurgeBatchClass(TestCase):
         )
         requests_delete_mock.side_effect = http_error
 
-        page = EventIndex.objects.get(url_path="/home/events/")
-
         batch = PurgeBatch()
-        batch.add_page(page)
+        batch.add_url("http://localhost/events/")
 
         with self.assertLogs(level="ERROR") as log_output:
             batch.purge(backend_settings=backend_settings)

wagtail/contrib/frontend_cache/utils.py

@@ -64,6 +64,15 @@ def purge_url_from_cache(url, backend_settings=None, backends=None):
 
 
 def purge_urls_from_cache(urls, backend_settings=None, backends=None):
+    if not urls:
+        return
+
+    backends = get_backends(backend_settings, backends)
+
+    # If no backends are configured, there's nothing to do
+    if not backends:
+        return
+
     # Convert each url to urls one for each managed language (WAGTAILFRONTENDCACHE_LANGUAGES setting).
     # The managed languages are common to all the defined backends.
     # This depends on settings.USE_I18N
@@ -105,8 +114,6 @@ def purge_urls_from_cache(urls, backend_settings=None, backends=None):
     for url in urls:
         urls_by_hostname[urlsplit(url).netloc].append(url)
 
-    backends = get_backends(backend_settings, backends)
-
     for hostname, urls in urls_by_hostname.items():
         backends_for_hostname = {
             backend_name: backend
@@ -150,14 +157,14 @@ class PurgeBatch:
     """Represents a list of URLs to be purged in a single request"""
 
     def __init__(self, urls=None):
-        self.urls = []
+        self.urls = set()
 
         if urls is not None:
             self.add_urls(urls)
 
     def add_url(self, url):
         """Adds a single URL"""
-        self.urls.append(url)
+        self.urls.add(url)
 
     def add_urls(self, urls):
         """
@@ -166,7 +173,7 @@ class PurgeBatch:
         This is equivalent to running ``.add_url(url)`` on each URL
         individually
         """
-        self.urls.extend(urls)
+        self.urls.update(urls)
 
     def add_page(self, page):
         """

wagtail/contrib/redirects/filters.py

@@ -1,27 +1,13 @@
 import django_filters
 from django import forms
-from django.db.models import QuerySet
 from django.utils.translation import gettext as _
 
 from wagtail.admin.filters import WagtailFilterSet
 from wagtail.contrib.redirects.models import Redirect
-from wagtail.models import Page, Site
-
-
-def get_redirect_pages_queryset(request) -> QuerySet[Page]:
-    redirect_page_pks = (
-        Redirect.objects.filter(redirect_page__isnull=False)
-        .order_by()
-        .values_list("redirect_page", flat=True)
-        .distinct()
-    )
-    return Page.objects.filter(pk__in=redirect_page_pks)
+from wagtail.models import Site
 
 
 class RedirectsReportFilterSet(WagtailFilterSet):
-    redirect_page = django_filters.ModelChoiceFilter(
-        field_name="redirect_page", queryset=get_redirect_pages_queryset
-    )
     is_permanent = django_filters.ChoiceFilter(
         label=_("Type"),
         method="filter_type",
@@ -44,4 +30,4 @@ class RedirectsReportFilterSet(WagtailFilterSet):
 
     class Meta:
         model = Redirect
-        exclude = []
+        fields = ["is_permanent", "site"]

wagtail/contrib/redirects/locale/af/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/ar/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: ROGER MICHAEL ASHLEY ALLEN <rogermaallen@gmail.com>, 2015\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/az_AZ/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"

wagtail/contrib/redirects/locale/be/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Andrei Satsevich, 2023-2024\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"

wagtail/contrib/redirects/locale/bg/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014\n"
 "Language-Team: Bulgarian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/bn/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/ca/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Roger Pons <rogerpons@gmail.com>, 2017,2023-2024\n"
 "Language-Team: Catalan (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/cs/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Marek Turnovec <aesculap@gmail.com>, 2016\n"
 "Language-Team: Czech (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/cy/LC_MESSAGES/django.po

@@ -5,13 +5,14 @@
 # Translators:
 # Philip Crisp, 2022
 # Philip Crisp, 2022
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
-"Last-Translator: Philip Crisp, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
@@ -103,6 +104,9 @@ msgstr "dros dro"
 msgid "redirect"
 msgstr "ailgyfeirio"
 
+msgid "redirects"
+msgstr "ailgyfeirio"
+
 msgid "Add redirect"
 msgstr "Ychwanegu ailgyfeiriad"
 
@@ -115,6 +119,17 @@ msgstr "Ailgyfeiriadau"
 msgid "Import redirects"
 msgstr "Mewnforio ailgyfeiriadau"
 
+msgid ""
+"<p>Select a file where redirects are separated into rows and contains the "
+"columns representing <code>from</code> and <code>to</code> (they can be "
+"named anything).</p> <p>After submitting you will be taken to a confirmation "
+"view where you can customize your redirects before import.</p>"
+msgstr ""
+"<p>Dewiswch ffeil lle mae ailgyfeiriadau wedi'u gwahanu'n rhesi ac yn "
+"cynnwys y colofnau sy'n cynrychioli <code>o</code> a <code>i</code> (gellir "
+"eu henwi yn unrhyw beth).</p> <p>Ar ôl cyflwyno byddwch yn cael eich tywys i "
+"olwg cadarnhau lle gallwch addasu eich ailgyfeiriadau cyn mewnforio.</p>"
+
 msgid "Import"
 msgstr "Mewnforio"
 

wagtail/contrib/redirects/locale/da/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/de/LC_MESSAGES/django.po

@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: 79353a696ad19dc202b261b3067b7640_bec941e, 2015\n"
 "Language-Team: German (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/dv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Fauzaan Gasim, 2024\n"
 "Language-Team: Divehi (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/redirects/locale/el/LC_MESSAGES/django.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-19 16:26+0100\n"
+"POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
 "Last-Translator: Yiannis Inglessis <negtheone@gmail.com>, 2016\n"
 "Language-Team: Greek (http://app.transifex.com/torchbox/wagtail/language/"