WTForms 3.3.0b3__tar.gz → 3.3.1__tar.gz

{wtforms-3.3.0b3 → wtforms-3.3.1}/CHANGES.rst

@@ -1,118 +1,125 @@
 .. currentmodule:: wtforms
 
-Version 3.3.0b3
----------------
+Version 3.3.1
+-------------
 
-Released 2026-06-12
+Released 2026-10-24
 
-- Add :func:`fields.enum_choices`, :func:`fields.enum_coerce` and
-  :func:`~wtforms.datalist.enum_datalist` for Enum-backed choices,
-  replacing ``SelectChoice.from_enum`` and friends. :issue:`922`
-- An Enum ``coerce`` is no longer wrapped, and options default to
-  ``member.value``. :issue:`922`
+- Fix :class:`~fields.FieldList` entries losing the form prefix in their
+  ``name`` when the list renumbers them. :issue:`944`
+- Speed up :class:`~validators.URL` on hostnames with many consecutive
+  dashes. :issue:`945`
 
-Version 3.3.0b2
----------------
+Version 3.3.0
+-------------
 
-Released 2026-05-24
+Released 2026-10-23
 
-- :class:`~fields.SelectField` ``choices`` accepts a shorthand dict
-  syntax: ``{value: label}`` for flat options and
-  ``{label: {value: label}}`` for optgroups. :issue:`886`
-- Split choice types by role: :class:`~fields.SelectChoice` and
-  :class:`~fields.DataListChoice` to declare options via ``choices=``,
-  :class:`~fields.Choice` for what ``iter_choices`` / ``iter_groups``
-  yield. :issue:`922`
+- Drop support for Python 3.10. Add support for Python 3.15.
+- Add native :class:`DataList` support. Options are declared with
+  :class:`DataListChoice`, or with the shorthand ``{value: label}``
+  dict syntax. :issue:`653` :issue:`886` :pr:`921`
+- Add :class:`~fields.ButtonField` to render ``<button type="submit">``
+  controls with string values. :issue:`784` :pr:`892`
+- Add :class:`~validators.DateRange`. ``min`` and ``max`` may be callables
+  to compute dynamic bounds; :class:`~validators.NumberRange` accepts
+  callables on the same terms. :pr:`787`
+- Add :class:`~fields.FieldList` ``insert_entry`` and indexed ``pop_entry``.
+  The following entries are renumbered, with their ids and labels.
+  :issue:`256` :pr:`901` :pr:`912`
+- :class:`~fields.SelectField` refactor. Options are declared with
+  :class:`~fields.SelectChoice`, which takes HTML attributes in
+  ``render_kw`` and an ``optgroup``. ``iter_choices``
+  and ``iter_groups`` yield
+  :class:`~fields.Choice` objects. ``choices`` also accepts the shorthand
+  dict syntax: ``{value: label}`` for flat options and
+  ``{label: {value: label}}`` for optgroups. :issue:`692` :issue:`886`
+  :issue:`922` :pr:`739` :pr:`889`
 - ``choices`` callables on :class:`~fields.SelectField` and
-  :class:`~datalist.DataList` may accept ``(form, field)``. Resolved
-  once per processing cycle. :issue:`922`
+  :class:`DataList` may accept ``(form, field)``. They run on the
+  first read and their result is cached. Calling
+  :meth:`~form.BaseForm.post_process` again refreshes them, also for the
+  entries added with :meth:`~fields.FieldList.append_entry` and
+  :meth:`~fields.FieldList.insert_entry`. :issue:`922`
+- Add :func:`fields.enum_choices`, :func:`fields.enum_coerce` and
+  :func:`~datalist.enum_datalist` for Enum-backed choices. :issue:`338`
+  :issue:`922` :pr:`916`
 - Add :meth:`fields.Field.post_process` and
   :meth:`form.BaseForm.post_process` hooks, propagated through
-  :class:`~fields.FormField` and :class:`~fields.FieldList` for
+  :class:`~fields.FormField` and :class:`~fields.FieldList`, for
   cross-field finalization. :issue:`922`
 - Add ``Field._form`` and ``BaseForm._parent_form`` so fields and nested
-  forms can reach their enclosing form. Fix :class:`~fields.FieldList`
-  entries and :class:`~fields.SelectField` option subfields which
-  previously got ``form=None``. :issue:`922`
-- Restore 3.2 compatibility for :class:`~fields.SelectField` subclasses:
-  tuple yields from :meth:`~fields.SelectFieldBase.iter_choices` /
-  :meth:`~fields.SelectFieldBase.iter_groups`,
-  3-positional :meth:`widgets.Select.render_option` overrides,
-  :meth:`~fields.SelectFieldBase.has_groups` /
-  :meth:`~fields.SelectFieldBase.iter_groups`, and ``self.choices``
-  keeping the user-supplied shape. Each emits a ``DeprecationWarning``;
-  will be removed in WTForms 4.0. :issue:`922`
-
-Version 3.3.0b1
----------------
-
-Released 2026-05-10
-
-- Add :class:`~validators.DateRange`. ``min`` and ``max`` may be callables
-  to compute dynamic bounds; :class:`~validators.NumberRange` accepts
-  callables on the same terms. :pr:`787`
+  forms can reach their enclosing form. :class:`~fields.FieldList` entries
+  and :class:`~fields.SelectField` option subfields no longer get
+  ``form=None``. :issue:`922`
+- Add ``invalid_value_message`` and ``invalid_choice_message`` keyword
+  arguments for customizing built-in field error messages. On
+  :class:`~fields.SelectMultipleField`, ``invalid_choice_message`` may also
+  be a callable for custom pluralization. :issue:`39` :issue:`832` :pr:`902`
+- :class:`~fields.SelectField` and :class:`~fields.SelectMultipleField`
+  ``pre_validate`` short-circuits when ``process_formdata`` already produced
+  an error, so a single coercion failure no longer surfaces as both an
+  "invalid value" and an "invalid choice" error. :pr:`902`
+- Numeric, date, time and select fields report a validation error instead of
+  raising a :class:`TypeError` when the input is not a string. :pr:`936`
+- Each bound field gets its own copy of ``render_kw``, and so does its
+  :class:`DataList`. Changing one of them on a form instance no
+  longer changes it on the other ones. :issue:`942`
 - Make :class:`~fields.FloatField` render as ``<input type="number">`` with
   ``step="any"``. :issue:`677` :pr:`679`
-- :meth:`~fields.FieldList._add_entry` now routes through :meth:`~meta.DefaultMeta.bind_field`,
-  consistent with how the form constructor binds top-level fields. Custom ``Meta.bind_field``
-  overrides were silently bypassed for all ``FieldList`` entries. :pr:`891`
-- Add `test_environment` support to :class:`~validators.Email`. :issue:`869` :pr:`894`
-- Reset :class:`~fields.FieldList` index state when reprocessing entries. :issue:`874` :pr:`895`
-- Let :class:`~widgets.RangeInput` accept `min` and `max` at construction time. :issue:`693` :pr:`898`
-- Do not render a ``for`` attribute on the main label of :class:`~fields.RadioField`.
-  :issue:`775` :pr:`900`
-- Deprecate :class:`~fields.DateTimeField`, which will be removed in WTForms 3.4. :issue:`831` :pr:`897`
-- Clarify that :class:`~fields.SelectField` ``choices`` is re-evaluated at
-  every form instantiation, including callables, in the documentation. :issue:`875` :pr:`909`
-- Render ``False`` as ``value="False"`` in :class:`~fields.SelectField` options
-  instead of omitting the attribute. :issue:`878` :pr:`908`
-- Accept :class:`uuid.UUID` instances in the :class:`~validators.UUID` validator,
-  and translate unexpected types into :class:`~validators.ValidationError`
-  instead of letting :class:`TypeError` escape. :issue:`549` :pr:`769`
-- Escape double quotes in :class:`~markupsafe.Markup` attribute values
-  passed to :func:`~widgets.html_params`, and return a
-  :class:`~markupsafe.Markup`. :issue:`801` :pr:`906` :pr:`907`
-- Clarify documentation about filters. :issue:`859` :pr:`896`
+- Add a ``tz`` parameter to :class:`~fields.DateTimeLocalField` to associate a
+  timezone with the input. :issue:`833` :pr:`905`
+- Let :class:`~widgets.RangeInput` accept ``min`` and ``max`` at construction
+  time. :issue:`693` :pr:`898`
+- ``FieldList._add_entry`` routes through
+  :meth:`~meta.DefaultMeta.bind_field`, like the top-level fields. Custom
+  ``Meta.bind_field`` overrides were silently bypassed for
+  :class:`~fields.FieldList` entries. :pr:`891`
+- Reset :class:`~fields.FieldList` index state when reprocessing entries.
+  :issue:`874` :pr:`895`
+- Do not render a ``for`` attribute on the main label of
+  :class:`~fields.RadioField`. :issue:`775` :pr:`900`
+- Render ``False`` as ``value="False"`` in :class:`~fields.SelectField`
+  options instead of omitting the attribute. :issue:`878` :pr:`908`
 - Let render-time ``checked`` kwargs take precedence over the field's value
   in :class:`~widgets.CheckboxInput` and :class:`~widgets.RadioInput`.
   :issue:`706` :pr:`910`
-- Add a ``tz`` parameter to :class:`~fields.DateTimeLocalField` to associate a
-  timezone with the input. :issue:`833` :pr:`905`
-- Add :class:`~fields.FieldList` ``insert_entry`` and indexed ``pop_entry``.
-  :issue:`256` :pr:`901` :pr:`912`
-- Add :class:`~fields.ButtonField` to render ``<button type="submit">``
-  controls with string values. :issue:`784` :pr:`892`
-- :class:`~fields.SelectField` refactor. Choices tuples and dicts are
-  deprecated in favor of :class:`~fields.Choice`. :pr:`739` :pr:`889`
-- ``<option>`` HTML attributes can be passed using
-  :class:`~fields.Choice`. :issue:`692` :pr:`739` :pr:`889`
-- Add :meth:`fields.Choice.from_enum` to build choices from an
-  :class:`enum.Enum` class, and let :class:`~fields.SelectField` accept an
-  Enum class as ``coerce``. :issue:`338` :pr:`916`
-- Defer to ``email_validator``'s module-level defaults for the
-  :class:`~validators.Email` ``test_environment``, ``allow_smtputf8`` and
-  ``allow_empty_local`` options. :issue:`915` :pr:`917`
-- Add ``invalid_value_message`` and ``invalid_choice_message`` keyword
-  arguments for customizing built-in field error messages. On
-  ``SelectMultipleField``, ``invalid_choice_message`` may also be a callable
-  for custom pluralization. :issue:`39` :issue:`832` :pr:`902`
-- :class:`~fields.SelectField` and :class:`~fields.SelectMultipleField`
-  ``pre_validate`` now short-circuits when ``process_formdata`` already
-  produced an error, so a single coercion failure no longer surfaces as both
-  an "invalid value" and an "invalid choice" error. :pr:`902`
-- Add a ``matcher`` keyword argument to :class:`~validators.Regexp` to
-  override the matching function. Defaults to :func:`re.match`; pass
-  :func:`re.search` or :func:`re.fullmatch` to change the anchoring
-  behaviour. :issue:`867` :pr:`918`
-- Add an ``html_pattern`` keyword argument to :class:`~validators.Regexp`
-  to control the HTML ``pattern`` attribute emitted on supporting widgets.
-  :pr:`759`
+- Escape double quotes in ``Markup`` attribute values
+  passed to :func:`~widgets.html_params`, and return a
+  ``Markup``. :issue:`801` :pr:`906` :pr:`907`
+- Add ``test_environment`` support to :class:`~validators.Email`, and defer
+  to ``email_validator``'s module-level defaults for its
+  ``test_environment``, ``allow_smtputf8`` and ``allow_empty_local``
+  options. :issue:`869` :issue:`915` :pr:`894` :pr:`917`
+- Add ``matcher`` and ``html_pattern`` keyword arguments to
+  :class:`~validators.Regexp`. ``matcher`` overrides the matching function,
+  :func:`re.match` by default: pass :func:`re.search` or :func:`re.fullmatch`
+  to change the anchoring. ``html_pattern`` controls the HTML ``pattern``
+  attribute emitted on supporting widgets. :issue:`867` :pr:`759` :pr:`918`
 - :class:`~validators.URL` validator is based on ``urllib.parse.urlparse``
   instead of a regex. New keyword arguments: ``allow_userinfo`` for
   accepting ``user:password@host`` URLs; ``schemes``
-  (default ``("http", "https")``) is the allowlist of accepted schemes
+  (default ``("http", "https")``) is the allowlist of accepted schemes.
   :pr:`847`
-- Add native :class:`DataList` support. :issue:`653` :pr:`921`
+- Accept :class:`uuid.UUID` instances in the :class:`~validators.UUID`
+  validator, and translate unexpected types into
+  :class:`~validators.ValidationError` instead of letting
+  :class:`TypeError` escape. :issue:`549` :pr:`769`
+- Clarify the documentation of filters, and of :class:`~fields.SelectField`
+  ``choices``. :issue:`859` :issue:`875` :pr:`896` :pr:`909`
+- Update the Dutch and Serbian translations.
+- Deprecate :class:`~fields.DateTimeField`, which will be removed in WTForms
+  3.4. :issue:`831` :pr:`897`
+- Passing :class:`~fields.SelectField` ``choices`` as tuples, or as a dict
+  that is not the shorthand syntax, is deprecated and will be removed in
+  WTForms 3.4. Use :class:`~fields.SelectChoice` instead. :issue:`922`
+- Passing a callable to ``SelectFieldBase._choices_from_input`` is
+  deprecated and will be removed in WTForms 3.4.
+- For :class:`~fields.SelectField` subclasses, yielding raw tuples from
+  ``iter_choices`` or
+  ``iter_groups``, and overriding
+  ``Select.render_option`` with the pre-3.3 signature, are
+  deprecated and will be removed in WTForms 4.0. :issue:`922`
 
 Version 3.2.2
 -------------

{wtforms-3.3.0b3 → wtforms-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: WTForms
-Version: 3.3.0b3
+Version: 3.3.1
 Summary: Form validation and rendering for Python web development.
 Project-URL: Documentation, https://wtforms.readthedocs.io
 Project-URL: Changes, https://wtforms.readthedocs.io/changes
@@ -44,7 +44,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: markupsafe>=1.1.1
 Provides-Extra: email
 Requires-Dist: email-validator>=2.0; extra == 'email'

{wtforms-3.3.0b3 → wtforms-3.3.1}/docs/fields.rst

@@ -67,6 +67,7 @@ The Field base class
     .. automethod:: process(formdata [, data])
     .. automethod:: process_data
     .. automethod:: process_formdata
+    .. automethod:: post_process
     .. attribute:: data
 
         Contains the resulting (sanitized) value of calling either of the
@@ -329,8 +330,8 @@ Choice Fields
                 SelectChoice('text', 'Plain Text'),
             ])
 
-    Note that the `choices` keyword is evaluated each time the form is
-    instantiated, so callables passed as `choices` are re-evaluated per instance.
+    A callable passed as `choices` is resolved separately for each form
+    instance, the first time its choices are read.
     For dynamic options, either pass a callable to `choices` or assign
     `field.choices` after instantiation. Any submitted choices which are not in
     the given choices list will cause validation on the field to fail. If this
@@ -361,17 +362,22 @@ Choice Fields
             user = User.query.get(id)
             form = UserDetails(request.POST, obj=user)
 
-    Note we passed a callable to `choices` rather than a static list; it is
-    invoked each time the form is instantiated, producing fresh options per
-    request. If the choices depend on data only available in the view, you can
-    instead assign `form.group_id.choices` after instantiation. The `coerce`
-    keyword arg to :class:`~wtforms.fields.SelectField` says that we use
-    :func:`int()` to coerce form data. The default coerce is :func:`str()`.
+    Note we passed a callable to `choices` rather than a static list; it
+    produces fresh options per request. Its result is cached. Calling
+    :meth:`~wtforms.form.BaseForm.post_process` again refreshes it.
+
+    If the choices depend on data only available in the view, you can instead
+    assign `form.group_id.choices` after instantiation. A list assigned this
+    way replaces the callable.
+
+    The `coerce` keyword arg to :class:`~wtforms.fields.SelectField` says
+    that we use :func:`int()` to coerce form data. The default coerce is
+    :func:`str()`.
 
     The callable may optionally accept ``(form, field)`` as positional
-    arguments. When this signature is used, the callable is invoked after the
-    whole form has been processed, so it can read ``field.data`` and the data
-    of any other field on the form::
+    arguments. The callable is invoked when the choices are read, normally
+    after the whole form has been processed, so it can read ``field.data`` and
+    the data of any other field on the form::
 
         def available_groups(form, field):
             return [SelectChoice(g.id, g.name) for g in form.tenant.data.groups]
@@ -610,12 +616,15 @@ Data Lists
 
     ``choices`` is either a list of :class:`~wtforms.DataListChoice`
     (or plain strings, in which case the string is used as both value
-    and label), or a callable invoked at render time. The callable
-    may take no argument (``fn()``) for a static list, or ``(field)``
-    to adapt the suggestions to the current field value at each
-    render — convenient for server-side filtering::
+    and label), a shorthand ``{value: label}`` dict, or a callable. The
+    callable runs when the datalist is rendered, after the whole form has been
+    processed. Its result is cached until the next
+    :meth:`~wtforms.form.BaseForm.post_process`. The callable may
+    take no argument (``fn()``) for a static list, or ``(form, field)``
+    to adapt the suggestions to the form data, for example the current
+    field value. This is convenient for server-side filtering::
 
-        DataList(lambda field: search(field.data))
+        DataList(lambda form, field: search(field.data))
 
     **Inline DataList owned by a field**
 
@@ -642,7 +651,7 @@ Data Lists
         class F(Form):
             items = FieldList(
                 StringField(
-                    datalist=DataList(lambda field: suggest(field.data))
+                    datalist=DataList(lambda form, field: suggest(field.data))
                 ),
                 min_entries=3,
             )

{wtforms-3.3.0b3 → wtforms-3.3.1}/docs/forms.rst

@@ -294,6 +294,8 @@ fields.
         this to provide form data to the enclosed fields. Accessing the field's
         data before calling process is not recommended.
 
+    .. automethod:: post_process
+
     .. automethod:: validate
 
     .. automethod:: __iter__

{wtforms-3.3.0b3 → wtforms-3.3.1}/docs/whats_new.rst

@@ -4,7 +4,22 @@ What's New in WTForms 3
 New Features
 ------------
 
-WTForms 3 is something something TODO
+WTForms 3.3 adds:
+
+- native :class:`~wtforms.DataList` support, to suggest values in a text
+  input;
+- :class:`~wtforms.fields.ButtonField`, to render ``<button type="submit">``
+  controls;
+- the :class:`~wtforms.validators.DateRange` validator;
+- :meth:`~wtforms.fields.FieldList.insert_entry` and an indexed
+  :meth:`~wtforms.fields.FieldList.pop_entry`;
+- a reworked :class:`~wtforms.fields.SelectField`: options are declared with
+  :class:`~wtforms.fields.SelectChoice`, which takes HTML attributes and an
+  optgroup, and ``choices`` callables run on the first read;
+- :meth:`~wtforms.form.BaseForm.post_process` hooks for cross-field
+  finalization.
+
+See :doc:`changes` for the full list, including the deprecations.
 
 
 Past Major Releases

{wtforms-3.3.0b3 → wtforms-3.3.1}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "MarkupSafe>=1.1.1",
 ]
@@ -49,12 +49,12 @@ dev = [
 env_list = [
     "style",
     "minversions",
+    "py315",
     "py314",
     "py313",
     "py312",
     "py311",
-    "py310",
-    "pypy310",
+    "pypy311",
     "docs",
 ]
 skip_missing_interpreters = true
@@ -86,7 +86,7 @@ dependency_groups = ["docs"]
 commands = [["sphinx-build", "-W", "-b", "html", "-d", "{envtmpdir}/doctrees", "docs", "{envtmpdir}/html"]]
 
 [tool.tox.env.minversions]
-base_python = ["py3.10"]
+base_python = ["py3.11"]
 uv_resolution = "lowest-direct"
 dependency_groups = ["dev"]
 commands = [

{wtforms-3.3.0b3 → wtforms-3.3.1}/src/wtforms/__init__.py

@@ -42,7 +42,7 @@ from wtforms.fields.simple import URLField
 from wtforms.form import Form
 from wtforms.validators import ValidationError
 
-__version__ = "3.3.0b3"
+__version__ = "3.3.1"
 
 __all__ = [
     "validators",

{wtforms-3.3.0b3 → wtforms-3.3.1}/src/wtforms/datalist.py

@@ -1,10 +1,11 @@
 import warnings
 from dataclasses import dataclass
 from dataclasses import field
+from dataclasses import replace
 
 from wtforms import widgets
-from wtforms._compat import get_signature
 from wtforms.fields.choices import _enum_options
+from wtforms.fields.choices import _invoke_choices_callable
 from wtforms.fields.choices import Choice
 
 __all__ = ("DataList", "DataListChoice", "enum_datalist")
@@ -70,7 +71,8 @@ def enum_datalist(enum_cls, *, by="value", label=None):
     Same semantics as :func:`~wtforms.fields.enum_choices`: ``by`` selects
     which member attribute becomes the ``<option>`` value (``"value"`` by
     default, ``"name"`` otherwise) and ``label`` defaults to ``str(member)``
-    when the Enum defines its own ``__str__``, else ``member.name``.
+    when the Enum defines its own ``__str__`` or is a :class:`enum.StrEnum`,
+    else ``member.name``.
 
     A ``<datalist>`` only suggests values for a free-text field, so there is
     no coercion counterpart — the field stores whatever string is submitted.
@@ -91,6 +93,7 @@ class DataList:
     def __init__(self, choices=None, *, render_kw=None, widget=None):
         self._raw_choices = choices
         self._choices = None if callable(choices) else choices
+        self._field = None
         self.render_kw = render_kw or {}
         if widget is not None:
             self.widget = widget
@@ -100,28 +103,34 @@ class DataList:
         clone = DataList.__new__(DataList)
         clone._raw_choices = self._raw_choices
         clone._choices = None if callable(self._raw_choices) else self._raw_choices
-        clone.render_kw = self.render_kw
+        clone._field = None
+        clone.render_kw = dict(self.render_kw)
         clone.widget = self.widget
         clone.id = id
         return clone
 
-    def _resolve(self, field):
-        raw = self._raw_choices
-        if not callable(raw):
-            return
-        try:
-            sig = get_signature(raw)
-            sig.bind(field._form, field)
-        except TypeError:
-            self._choices = raw()
-            return
-        self._choices = raw(field._form, field)
+    def _invalidate(self, field):
+        """Mark the choices for a lazy refresh on the next :meth:`iter_choices`."""
+        if callable(self._raw_choices):
+            self._field = field
 
     def iter_choices(self, field=None):
+        if (bound := self._field) is not None:
+            self._field = None
+            self._choices = _invoke_choices_callable(
+                self._raw_choices, bound._form, bound
+            )
         raw = self._choices
         if raw is None:
             return []
-        return [DataListChoice.from_input(item) for item in raw]
+        if isinstance(raw, dict):
+            return [
+                DataListChoice(value=value, label=label) for value, label in raw.items()
+            ]
+        return [
+            replace(choice, render_kw=dict(choice.render_kw or {}))
+            for choice in map(DataListChoice.from_input, raw)
+        ]
 
     def __call__(self, field=None, **kwargs):
         return self.widget(self, field=field, **kwargs)