wagtail 5.2.5__py3-none-any.whl → 5.2.6__py3-none-any.whl

wagtail/__init__.py

@@ -6,7 +6,7 @@ from wagtail.utils.version import get_semver_version, get_version
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (5, 2, 5, "final", 1)
+VERSION = (5, 2, 6, "final", 1)
 
 __version__ = get_version(VERSION)
 

wagtail/images/tests/test_admin_views.py

@@ -1,6 +1,7 @@
 import datetime
 import json
 import urllib
+from unittest.mock import patch
 
 from django.contrib.auth.models import Group, Permission
 from django.core.files.uploadedfile import SimpleUploadedFile, TemporaryUploadedFile
@@ -12,6 +13,8 @@ from django.utils.encoding import force_str
 from django.utils.html import escape, escapejs
 from django.utils.http import RFC3986_SUBDELIMS, urlencode
 from django.utils.safestring import mark_safe
+from willow.optimizers.base import OptimizerBase
+from willow.registry import registry
 
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.images import get_image_model
@@ -3434,6 +3437,35 @@ class TestPreviewView(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response["Content-Type"], "image/png")
 
+    def test_preview_with_optimizer(self):
+        """
+        Test that preview works with optimizers
+
+        Willow optimizers require
+        """
+
+        class DummyOptimizer(OptimizerBase):
+            library_name = "dummy"
+            image_format = "png"
+
+            @classmethod
+            def check_library(cls):
+                return True
+
+            @classmethod
+            def process(cls, file_path: str):
+                pass
+
+        # Get the image
+        with patch.object(registry, "_registered_optimizers", [DummyOptimizer]):
+            response = self.client.get(
+                reverse("wagtailimages:preview", args=(self.image.id, "fill-800x600"))
+            )
+
+        # Check response
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response["Content-Type"], "image/png")
+
     def test_get_invalid_filter_spec(self):
         """
         Test that an invalid filter spec returns a 400 response

wagtail/images/views/images.py

@@ -1,9 +1,10 @@
 import os
+from tempfile import SpooledTemporaryFile
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import InvalidPage, Paginator
-from django.http import Http404, HttpResponse, JsonResponse
+from django.http import FileResponse, Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.urls import reverse
@@ -333,8 +334,11 @@ def preview(request, image_id, filter_spec):
     image = get_object_or_404(get_image_model(), id=image_id)
 
     try:
-        response = HttpResponse()
-        image = Filter(spec=filter_spec).run(image, response)
+        # Temporary image needs to be an instance that Willow can run optimizers on
+        temp_image = SpooledTemporaryFile(max_size=settings.FILE_UPLOAD_MAX_MEMORY_SIZE)
+        image = Filter(spec=filter_spec).run(image, temp_image)
+        temp_image.seek(0)
+        response = FileResponse(temp_image)
         response["Content-Type"] = "image/" + image.format_name
         return response
     except InvalidFilterSpecError:

wagtail/search/tests/test_queries.py

@@ -258,6 +258,30 @@ class TestParseQueryString(SimpleTestCase):
         self.assertDictEqual(filters.dict(), {"author": "foo bar", "bar": "beer"})
         self.assertEqual(repr(query), repr(Phrase("hello world")))
 
+    def test_long_queries(self):
+        filters, query = parse_query_string("0" * 60_000)
+        self.assertEqual(filters.dict(), {})
+        self.assertEqual(repr(query), repr(PlainText("0" * 60_000)))
+
+        filters, _ = parse_query_string(f'{"a" * 60_000}:"foo bar"')
+        self.assertEqual(filters.dict(), {"a" * 60_000: "foo bar"})
+
+    def test_long_filter_value(self):
+        filters, _ = parse_query_string(f'foo:ba{"r" * 60_000}')
+        self.assertEqual(filters.dict(), {"foo": f'ba{"r" * 60_000}'})
+
+    def test_joined_filters(self):
+        filters, query = parse_query_string("foo:bar:baz")
+        self.assertEqual(filters.dict(), {"foo": "bar"})
+        self.assertEqual(repr(query), repr(PlainText(":baz")))
+
+        filters, query = parse_query_string("foo:'bar':baz")
+        self.assertEqual(filters.dict(), {"foo": "bar"})
+        self.assertEqual(repr(query), repr(PlainText(":baz")))
+
+        filters, query = parse_query_string("foo:'bar:baz'")
+        self.assertEqual(filters.dict(), {"foo": "bar:baz"})
+
     def test_multiple_phrases(self):
         filters, query = parse_query_string('"hello world" "hi earth"')
 

wagtail/search/utils.py

@@ -69,6 +69,8 @@ MUL = partial(balanced_reduce, operator.mul)
 
 MAX_QUERY_STRING_LENGTH = 255
 
+filters_regexp = re.compile(r'\b(\w+):(\w+|"[^"]+"|\'[^\']+\')')
+
 
 def normalise_query_string(query_string):
     # Truncate query string
@@ -83,20 +85,12 @@ def normalise_query_string(query_string):
 
 
 def separate_filters_from_query(query_string):
-    filters_regexp = r'(\w+):(\w+|"[^"]+"|\'[^\']+\')'
-
     filters = QueryDict(mutable=True)
-    for match_object in re.finditer(filters_regexp, query_string):
+    for match_object in filters_regexp.finditer(query_string):
         key, value = match_object.groups()
-        filters.update(
-            {
-                key: value.strip('"')
-                if value.strip('"') is not value
-                else value.strip("'")
-            }
-        )
-
-    query_string = re.sub(filters_regexp, "", query_string).strip()
+        filters.update({key: value.strip("\"'")})
+
+    query_string = filters_regexp.sub("", query_string).strip()
 
     return filters, query_string
 

wagtail/test/settings.py

@@ -1,5 +1,6 @@
 import os
 
+from django import VERSION as DJANGO_VERSION
 from django.contrib.messages import constants as message_constants
 from django.utils.translation import gettext_lazy as _
 
@@ -70,10 +71,10 @@ if os.environ.get("STATICFILES_STORAGE", "") == "manifest":
         "BACKEND"
     ] = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
 
-    # DJANGO_VERSION < 4.2
-    STATICFILES_STORAGE = (
-        "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
-    )
+    if DJANGO_VERSION < (4, 2):
+        STATICFILES_STORAGE = (
+            "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+        )
 
 
 USE_TZ = not os.environ.get("DISABLE_TIMEZONE")

{wagtail-5.2.5.dist-info → wagtail-5.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail
-Version: 5.2.5
+Version: 5.2.6
 Summary: A Django content management system.
 Home-page: https://wagtail.org/
 Author: Wagtail core team + contributors
@@ -63,7 +63,7 @@ Requires-Dist: boto3 (<2,>=1.28) ; extra == 'testing'
 Requires-Dist: freezegun (>=0.3.8) ; extra == 'testing'
 Requires-Dist: azure-mgmt-cdn (<13.0,>=12.0) ; extra == 'testing'
 Requires-Dist: azure-mgmt-frontdoor (<1.1,>=1.0) ; extra == 'testing'
-Requires-Dist: django-pattern-library (<0.8,>=0.7) ; extra == 'testing'
+Requires-Dist: django-pattern-library (>=0.7) ; extra == 'testing'
 Requires-Dist: coverage (>=3.7.0) ; extra == 'testing'
 Requires-Dist: black (==22.3.0) ; extra == 'testing'
 Requires-Dist: doc8 (==0.8.1) ; extra == 'testing'

{wagtail-5.2.5.dist-info → wagtail-5.2.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-wagtail/__init__.py,sha256=KYmHJ6c9rsbNHoePtUu5AJdDUqxY5EDr_WGSAGWkFlc,724
+wagtail/__init__.py,sha256=XDqUURNn4H7iay8_FXbaL5gYy1CE3-tAmIV_9eF-HW8,724
 wagtail/apps.py,sha256=38kXTdHoQzFnpUqDNxFpsqn2dut4V0u9rLOkhqCoYkc,713
 wagtail/compat.py,sha256=L41FhlX4xy5KgTdJ63smtM78mtKf1mxkPeOs8kyOwS0,538
 wagtail/coreutils.py,sha256=ZlmtoHC5YzXmhdKi13QkCSmBryAmS7k8s5jgQjahpEQ,20660
@@ -2762,7 +2762,7 @@ wagtail/images/templates/wagtailimages/widgets/image_chooser.html,sha256=Rn1LgFX
 wagtail/images/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/images/templatetags/wagtailimages_tags.py,sha256=a8GOwG-MmfRW0GJB-HQ6tqg8oBlH1Tk18O5OZR3tyQs,7718
 wagtail/images/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wagtail/images/tests/test_admin_views.py,sha256=LL6bSrJL_5c2APKLmCgRiTHQD5n5c_vJAb0V1OhLOhM,131698
+wagtail/images/tests/test_admin_views.py,sha256=hvBDpprDCJLKKHN6e5VoAD6PaxKwYy1sgKvakuq3adM,132653
 wagtail/images/tests/test_api_fields.py,sha256=CgCLk6PcIwXH4qcT9mBdsn43luD2CAiVZ6j4mxVadyQ,971
 wagtail/images/tests/test_blocks.py,sha256=ThEwsfPRwNrpJUkg3bqDBG2AXMp0GDgC1Takchi3dFg,2289
 wagtail/images/tests/test_form_overrides.py,sha256=ay_d_CoZFfv_QVbgsSEIZZGwsYfSrm4zkaV2kpG3H50,2727
@@ -2793,7 +2793,7 @@ wagtail/images/tests/test_bulk_actions/test_bulk_add_to_collection.py,sha256=URM
 wagtail/images/tests/test_bulk_actions/test_bulk_delete.py,sha256=3dPB4scy8-qBll_X1YmYZY6AgYeQNNncIqDt9j-i7QM,2959
 wagtail/images/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wagtail/images/views/chooser.py,sha256=oumsJZCJwOaeZmNJyX3CshZO_C_Yd1tg062Wp63WncA,11714
-wagtail/images/views/images.py,sha256=QISla4ibdSQTiTMUbTrTQRf2ypp9uFD_VQTp0YVwSsY,14613
+wagtail/images/views/images.py,sha256=CSfu9KpYGcF4BZeTfC-LEHE2VPrd6UAinidIE_NeExE,14881
 wagtail/images/views/multiple.py,sha256=-ar34KEVs7Dj09-7HW17LPs_7zgM3eDaB0G72jLGJ5U,5687
 wagtail/images/views/serve.py,sha256=RvCF2AG9baMLeN2L0dU-Lk6D5wS7LMpkIRBD-E3SAIY,2950
 wagtail/images/views/bulk_actions/__init__.py,sha256=fDYVsKqg9AIt1GvNtgyi5RFlchzJeCuqxUno7fU3zAs,216
@@ -3174,7 +3174,7 @@ wagtail/search/models.py,sha256=8YNIfAMXtvZVWwOyQhbSDznmdT8EiPAWuu2BkwGBnEA,1008
 wagtail/search/query.py,sha256=QhZD3Sx2rtZWKz9BXq7Cy6oSHxJ1Ly0Nr9BpyyUsoiE,2340
 wagtail/search/queryset.py,sha256=qj6pjLnCH2W3bZGNUrpf7c82Bt7ZPrjGO6yRwT3m1f8,1221
 wagtail/search/signal_handlers.py,sha256=Md4dhmwLF7kX7YLG-MsqTLQ6NdfkFIavBJ9n5OsUIgA,956
-wagtail/search/utils.py,sha256=PnF65FM5Udc7mZ8J2oBMJ15T6vYGL0N69awp_RgEDmc,6210
+wagtail/search/utils.py,sha256=onx_ym1p0kMBggaormbztwM-T0lXvnTG5vyOuyDnMQ0,6075
 wagtail/search/backends/__init__.py,sha256=nJEc435WnprL13v7OwcUCyHz0CTXMCMar9xTRqn1rH8,3455
 wagtail/search/backends/base.py,sha256=M7lyovOz2Wau_UwjyEk7AYeQOLt6Q3Lm2hUHDUoEVNg,16806
 wagtail/search/backends/elasticsearch5.py,sha256=lfhUvXUafpmnw0kqdZVr9LBSUMjUuehMkixzj6rYYls,39018
@@ -3320,7 +3320,7 @@ wagtail/search/tests/test_mysql_backend.py,sha256=BsAJk-0y0nKsSOo4qovY8yHIRLnL6S
 wagtail/search/tests/test_page_search.py,sha256=1oPBcgyJQpJmAQaNAhDAWXdVe2xrZ6kf7clefPZ0JLY,2363
 wagtail/search/tests/test_postgres_backend.py,sha256=QAR78RKMAUCH9beNu3r1Qxuhb865K8NU1C9sWC8lVco,7406
 wagtail/search/tests/test_postgres_stemming.py,sha256=zUqIANnIu4FD8SQtDd0xtCKH6x5voe9mdgA7nK0g3Wk,1346
-wagtail/search/tests/test_queries.py,sha256=-79wHb7o98Jy4QaeJM_I0WXvh4LMRDYD2kaJYWfUk2c,14150
+wagtail/search/tests/test_queries.py,sha256=2nwg7h4DgITTbG6dHC8xgM3s3mKFonlR1VKTZT3BMoI,15189
 wagtail/search/tests/test_related_fields.py,sha256=B3vvhVVzzBQQYgbe2n6WE9s3VkD4YniCxfqy8nIQXU8,3420
 wagtail/search/tests/test_sqlite_backend.py,sha256=csgHqTr7P2F4-KwMYq6UaehlLs73XG0uVQJn9hWWzVM,1821
 wagtail/sites/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -3624,7 +3624,7 @@ wagtail/test/headless_urls.py,sha256=v1mY7fcuKFIang6wpDB8qGcvCwQzkWh_rHfmSF1wdHA
 wagtail/test/manage.py,sha256=JaihE2eqQFMxzd83WWPE4DLnZbzq0bqEkozWAbe-xn8,255
 wagtail/test/middleware.py,sha256=noHy_kAzZ-61uC_PCLr8WLYWSpqx83dsE8OsVPv56tA,906
 wagtail/test/non_root_urls.py,sha256=ZWPGHRmWHmx2Ext6S_TONDj4ZHdBt5BNZoULON1nDlA,556
-wagtail/test/settings.py,sha256=ofhHa1KJaJSno-cKoWwMneLxi4vjYvpCdzAFWsg9oJ8,9490
+wagtail/test/settings.py,sha256=5LsIaNYQRmFzh1Uroruuq5HsrYGERZSKTTiuRkRxvcs,9552
 wagtail/test/settings_ui.py,sha256=zg6mNziQPeeIBcat2TOPdqdL8zHc6QyADsNFHxt6PiM,1037
 wagtail/test/urls.py,sha256=4JIjXPBeaOSBV2jBrgOeMlVuGbl_SWZK_bqmVBxF7eI,2474
 wagtail/test/urls_multilang.py,sha256=tkd6-d4cNNTDQwIoyDVUPL0Ya51W326N8LSVOIdFnF8,190
@@ -4071,9 +4071,9 @@ wagtail/utils/urlpatterns.py,sha256=RDhVScxdm-RV4HSMjWElyrbEoTPsXu841_SKMgoFKtY,
 wagtail/utils/utils.py,sha256=UALGn0KOyqi5ZoXOozWX99ZPUsVZP51ET8d7sZ1jlm0,430
 wagtail/utils/version.py,sha256=40WGMIy8nSPQJFF01p7c38L444SexH2Cb-bQmR8ztXg,1478
 wagtail/utils/widgets.py,sha256=oTpTMcmQ0Y4MugbSKp_Uigl97ftWdHvMfvhrrLyVmBs,1529
-wagtail-5.2.5.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
-wagtail-5.2.5.dist-info/METADATA,sha256=Rb8f_0eDycmk9VJu0Ug6xY5Sfx0juLgiLsrFnN69r3Q,3855
-wagtail-5.2.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wagtail-5.2.5.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
-wagtail-5.2.5.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
-wagtail-5.2.5.dist-info/RECORD,,
+wagtail-5.2.6.dist-info/LICENSE,sha256=0aiL7_RJ2YkOjscmRI7opwmuURrY6h8MR0B24nrdRQU,1512
+wagtail-5.2.6.dist-info/METADATA,sha256=ggJawfxlL1fllg9awx_FmLH2WB0CPkL4re9iyWet3IU,3850
+wagtail-5.2.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wagtail-5.2.6.dist-info/entry_points.txt,sha256=R14Z0xKoufNcDaku0EWDKM-K8J4ap0EImO8C-df8HVM,53
+wagtail-5.2.6.dist-info/top_level.txt,sha256=zcKgvuRTi0gSgVzJ1qMoERCwhQ_i0n9bkyxza3oh9as,8
+wagtail-5.2.6.dist-info/RECORD,,