wagtail 6.4.1__py3-none-any.whl → 7.0rc1__py3-none-any.whl

wagtail/tests/test_streamfield.py

@@ -8,6 +8,7 @@ from django.test import TestCase, skipUnlessDBFeature
 from django.utils.safestring import SafeString
 
 from wagtail import blocks
+from wagtail.admin.forms import WagtailAdminModelForm
 from wagtail.blocks import StreamBlockValidationError, StreamValue
 from wagtail.fields import StreamField
 from wagtail.images.models import Image
@@ -22,6 +23,7 @@ from wagtail.test.testapp.models import (
     JSONStreamModel,
     StreamPage,
 )
+from wagtail.test.utils.form_data import nested_form_data, rich_text, streamfield
 
 
 class TestLazyStreamField(TestCase):
@@ -225,6 +227,17 @@ class TestStreamValueAccess(TestCase):
         self.assertIsInstance(fetched_body[0].value, RichText)
         self.assertEqual(fetched_body[0].value.source, "<h2>hello world</h2>")
 
+    def test_normalize_on_assign(self):
+        self.json_body.body = [("rich_text", "<h2>hello world</h2>")]
+        self.json_body.save()
+
+        # the body should now be a stream consisting of a single rich_text block
+        fetched_body = JSONStreamModel.objects.get(id=self.json_body.id).body
+        self.assertIsInstance(fetched_body, StreamValue)
+        self.assertEqual(len(fetched_body), 1)
+        self.assertIsInstance(fetched_body[0].value, RichText)
+        self.assertEqual(fetched_body[0].value.source, "<h2>hello world</h2>")
+
     def test_can_append(self):
         self.json_body.body.append(("text", "bar"))
         self.json_body.save()
@@ -237,6 +250,30 @@ class TestStreamValueAccess(TestCase):
         self.assertEqual(fetched_body[1].block_type, "text")
         self.assertEqual(fetched_body[1].value, "bar")
 
+    def test_normalize_on_append(self):
+        self.json_body.body.append(("rich_text", "<h2>hello world</h2>"))
+        self.json_body.save()
+
+        fetched_body = JSONStreamModel.objects.get(id=self.json_body.id).body
+        self.assertIsInstance(fetched_body, StreamValue)
+        self.assertEqual(len(fetched_body), 2)
+        self.assertEqual(fetched_body[0].block_type, "text")
+        self.assertEqual(fetched_body[0].value, "foo")
+        self.assertEqual(fetched_body[1].block_type, "rich_text")
+        self.assertIsInstance(fetched_body[1].value, RichText)
+        self.assertEqual(fetched_body[1].value.source, "<h2>hello world</h2>")
+
+    def test_normalize_on_replace(self):
+        self.json_body.body[0] = ("rich_text", "<h2>hello world</h2>")
+        self.json_body.save()
+
+        fetched_body = JSONStreamModel.objects.get(id=self.json_body.id).body
+        self.assertIsInstance(fetched_body, StreamValue)
+        self.assertEqual(len(fetched_body), 1)
+        self.assertEqual(fetched_body[0].block_type, "rich_text")
+        self.assertIsInstance(fetched_body[0].value, RichText)
+        self.assertEqual(fetched_body[0].value.source, "<h2>hello world</h2>")
+
     def test_can_append_on_queried_instance(self):
         # The test is analog to test_can_append(), but instead of working with the
         # in-memory version from JSONStreamModel.objects.create(), we query a fresh
@@ -512,6 +549,57 @@ class TestStreamFieldCountValidation(TestCase):
         instance = JSONMinMaxCountStreamModel.objects.create(body=json.dumps(body))
         self.assertTrue(instance.body.stream_block.clean(instance.body))
 
+    def test_minimum_count_disregarded_when_deferring_validation(self):
+        class StreamForm(WagtailAdminModelForm):
+            class Meta:
+                model = JSONMinMaxCountStreamModel
+                fields = ["body"]
+                defer_required_on_fields = ["body"]
+
+        form_data = nested_form_data(
+            {
+                "body": streamfield(
+                    [
+                        ("text", "Some text"),
+                    ]
+                )
+            }
+        )
+        form = StreamForm(form_data)
+        self.assertFalse(form.is_valid())
+
+        form = StreamForm(form_data)
+        form.defer_required_fields()
+        self.assertTrue(form.is_valid())
+
+    def test_maximum_count_respected_when_deferring_validation(self):
+        class StreamForm(WagtailAdminModelForm):
+            class Meta:
+                model = JSONMinMaxCountStreamModel
+                fields = ["body"]
+                defer_required_on_fields = ["body"]
+
+        form_data = nested_form_data(
+            {
+                "body": streamfield(
+                    [
+                        ("text", "Some text"),
+                        ("text", "Some text"),
+                        ("text", "Some text"),
+                        ("text", "Some text"),
+                        ("text", "Some text"),
+                        ("text", "Some text"),
+                    ]
+                )
+            }
+        )
+        form = StreamForm(form_data)
+        self.assertFalse(form.is_valid())
+
+        form = StreamForm(form_data)
+        form.defer_required_fields()
+        self.assertFalse(form.is_valid())
+
     def test_maximum_count(self):
         # 5 blocks okay
         body = [self.rich_text_body] * 5
@@ -592,6 +680,54 @@ class TestStreamFieldCountValidation(TestCase):
         instance = JSONBlockCountsStreamModel.objects.create(body=json.dumps(body))
         self.assertTrue(instance.body.stream_block.clean(instance.body))
 
+    def test_block_count_minimum_disregarded_when_deferring_validation(self):
+        class StreamForm(WagtailAdminModelForm):
+            class Meta:
+                model = JSONBlockCountsStreamModel
+                fields = ["body"]
+                defer_required_on_fields = ["body"]
+
+        form_data = nested_form_data(
+            {
+                "body": streamfield(
+                    [
+                        ("rich_text", rich_text("Some text")),
+                    ]
+                )
+            }
+        )
+        form = StreamForm(form_data)
+        self.assertFalse(form.is_valid())
+
+        form = StreamForm(form_data)
+        form.defer_required_fields()
+        self.assertTrue(form.is_valid())
+
+    def test_block_count_maximum_respected_when_deferring_validation(self):
+        class StreamForm(WagtailAdminModelForm):
+            class Meta:
+                model = JSONBlockCountsStreamModel
+                fields = ["body"]
+                defer_required_on_fields = ["body"]
+
+        form_data = nested_form_data(
+            {
+                "body": streamfield(
+                    [
+                        ("rich_text", rich_text("Some text")),
+                        ("rich_text", rich_text("Some text")),
+                        ("rich_text", rich_text("Some text")),
+                    ]
+                )
+            }
+        )
+        form = StreamForm(form_data)
+        self.assertFalse(form.is_valid())
+
+        form = StreamForm(form_data)
+        form.defer_required_fields()
+        self.assertFalse(form.is_valid())
+
     def test_streamfield_count_argument_precedence(self):
         class TestStreamBlock(blocks.StreamBlock):
             heading = blocks.CharBlock()

wagtail/tests/test_utils.py

@@ -3,7 +3,6 @@ import os
 import pickle
 import tempfile
 import unittest
-import warnings
 from io import BytesIO
 from pathlib import Path
 
@@ -31,7 +30,6 @@ from wagtail.coreutils import (
     string_to_ascii,
 )
 from wagtail.models import Page, Site
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
 from wagtail.utils.file import hash_filelike
 from wagtail.utils.templates import template_is_overridden
 from wagtail.utils.utils import deep_update, flatten_choices
@@ -53,7 +51,7 @@ class TestStringToAscii(TestCase):
     def test_string_to_ascii(self):
         test_cases = [
             ("30 \U0001d5c4\U0001d5c6/\U0001d5c1", "30 km/h"),
-            ("\u5317\u4EB0", "BeiJing"),
+            ("\u5317\u4eb0", "BeiJing"),
             ("ぁ あ ぃ い ぅ う ぇ", "a a i i u u e"),
             (
                 "Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն",
@@ -657,23 +655,3 @@ class TestFlattenChoices(SimpleTestCase):
                 "unknown": "Unknown",
             },
         )
-
-
-class TestWidgetWithScript(TestCase):
-    def test_deprecation(self):
-        message = "The usage of `WidgetWithScript` hook is deprecated. Use external scripts instead."
-
-        with unittest.mock.patch("warnings.warn", wraps=warnings.warn) as warn_mock:
-            with self.assertWarnsMessage(RemovedInWagtail70Warning, message):
-                from wagtail.utils.widgets import WidgetWithScript
-
-                class MyWidget(WidgetWithScript):
-                    pass
-
-        # Make sure warn was called with stacklevel=3, so the actual caller
-        # that imports WidgetWithScript is shown in the warning message
-        warn_mock.assert_called_with(
-            message,
-            category=RemovedInWagtail70Warning,
-            stacklevel=3,
-        )

wagtail/users/forms.py

@@ -1,5 +1,4 @@
 from itertools import groupby
-from warnings import warn
 
 from django import forms
 from django.conf import settings
@@ -23,22 +22,11 @@ from wagtail.models import (
     GroupPagePermission,
     Page,
 )
-from wagtail.utils.deprecation import RemovedInWagtail70Warning
 
 User = get_user_model()
 
 # The standard fields each user model is expected to have, as a minimum.
 standard_fields = {"email", "first_name", "last_name", "is_superuser", "groups"}
-# Custom fields
-if hasattr(settings, "WAGTAIL_USER_CUSTOM_FIELDS"):
-    custom_fields = set(settings.WAGTAIL_USER_CUSTOM_FIELDS)
-    warn(
-        "The `WAGTAIL_USER_CUSTOM_FIELDS` setting is deprecated. Use a custom "
-        "`UserViewSet` subclass and override `get_form_class()` instead.",
-        RemovedInWagtail70Warning,
-    )
-else:
-    custom_fields = set()
 
 
 class UsernameForm(forms.ModelForm):
@@ -110,9 +98,7 @@ class UserForm(UsernameForm):
     is_superuser = forms.BooleanField(
         label=_("Administrator"),
         required=False,
-        help_text=_(
-            "Administrators have full access to manage any object " "or setting."
-        ),
+        help_text=_("Administrators have full access to manage any object or setting."),
     )
 
     def __init__(self, *args, **kwargs):
@@ -207,7 +193,7 @@ class UserForm(UsernameForm):
 class UserCreationForm(UserForm):
     class Meta:
         model = User
-        fields = {User.USERNAME_FIELD} | standard_fields | custom_fields
+        fields = {User.USERNAME_FIELD} | standard_fields
         widgets = {"groups": forms.CheckboxSelectMultiple}
 
 
@@ -224,7 +210,7 @@ class UserEditForm(UserForm):
 
     class Meta:
         model = User
-        fields = {User.USERNAME_FIELD, "is_active"} | standard_fields | custom_fields
+        fields = {User.USERNAME_FIELD, "is_active"} | standard_fields
         widgets = {"groups": forms.CheckboxSelectMultiple}
 
 

wagtail/users/locale/ar/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Younes Oumakhou, 2022\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/be/LC_MESSAGES/django.po

@@ -4,14 +4,15 @@
 #
 # Translators:
 # Andrei Satsevich, 2023
+# Andrei Satsevich, 2023
 # Tatsiana Tsygan <art.tatsiana@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
-"Last-Translator: Andrei Satsevich, 2023\n"
+"Last-Translator: Tatsiana Tsygan <art.tatsiana@gmail.com>, 2018\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"
 "language/be/)\n"
 "MIME-Version: 1.0\n"

wagtail/users/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: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014\n"
 "Language-Team: Bulgarian (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/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: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/ca/LC_MESSAGES/django.po

@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
-"Last-Translator: Roger Pons <rogerpons@gmail.com>, 2017,2020,2023-2024\n"
+"Last-Translator: David Llop, 2014\n"
 "Language-Team: Catalan (http://app.transifex.com/torchbox/wagtail/language/"
 "ca/)\n"
 "MIME-Version: 1.0\n"

wagtail/users/locale/cs/LC_MESSAGES/django.po

@@ -10,11 +10,12 @@
 # Marek Turnovec <aesculap@gmail.com>, 2022-2023
 # Mirek Zvolský <zvolsky@seznam.cz>, 2019-2021
 # Tomáš Podivínský, 2023
+# Tomáš Podivínský, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Tomáš Podivínský, 2023\n"
 "Language-Team: Czech (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/cy/LC_MESSAGES/django.po

@@ -6,11 +6,12 @@
 # Philip Crisp, 2022
 # Philip Crisp, 2022
 # Philip Lindsay-Crisp, 2024
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/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: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/de/LC_MESSAGES/django.po

@@ -22,7 +22,7 @@
 # Moritz Pfeiffer <moritz@alp-phone.ch>, 2017
 # Oliver Engel <codeangel@posteo.de>, 2021-2022
 # Peter Dreuw <archandha@gmx.net>, 2019
-# Stefan Hammer <stefan@hammerworxx.com>, 2023-2024
+# Stefan Hammer <stefan@hammerworxx.com>, 2022-2024
 # Stefan Hammer <stefan@hammerworxx.com>, 2022
 # Tammo van Lessen <tvanlessen@gmail.com>, 2015
 # Stefan Hammer <stefan@hammerworxx.com>, 2022
@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
-"Last-Translator: Krzysztof Jeziorny <github@jeziorny.net>, 2024\n"
+"Last-Translator: 79353a696ad19dc202b261b3067b7640_bec941e, 2015\n"
 "Language-Team: German (http://app.transifex.com/torchbox/wagtail/language/"
 "de/)\n"
 "MIME-Version: 1.0\n"

wagtail/users/locale/dv/LC_MESSAGES/django.po

@@ -4,11 +4,12 @@
 #
 # Translators:
 # Fauzaan Gasim, 2024
+# Fauzaan Gasim, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Fauzaan Gasim, 2024\n"
 "Language-Team: Divehi (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/users/locale/el/LC_MESSAGES/django.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-20 17:59+0000\n"
+"POT-Creation-Date: 2025-04-24 13:03+0100\n"
 "PO-Revision-Date: 2014-02-19 11:54+0000\n"
 "Last-Translator: Yiannis Inglessis <negtheone@gmail.com>, 2016\n"
 "Language-Team: Greek (http://app.transifex.com/torchbox/wagtail/language/"