Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NoneOf and AnyOf can validate multiple valued fields #807

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Unreleased
- Removed `required` flag support from :class:`~fields.HiddenWidget`,
:class:`~fields.RangeWidget` and :class:`~fields.SelectWidget` to
conform to W3C :pr:`810`
- :class:`~wtforms.validators.NoneOf` and :class:`~wtforms.validators.AnyOf`
can validate multiple valued fields like :class:`~fields.SelectMultipleField`
:pr:`538` :pr:`807`

Version 3.1.2
-------------
Expand Down
6 changes: 4 additions & 2 deletions src/wtforms/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,8 @@ def __init__(self, values, message=None, values_formatter=None):
self.values_formatter = values_formatter

def __call__(self, form, field):
if field.data in self.values:
data = field.data if isinstance(field.data, list) else [field.data]
if any(d in self.values for d in data):
return

message = self.message
Expand Down Expand Up @@ -621,7 +622,8 @@ def __init__(self, values, message=None, values_formatter=None):
self.values_formatter = values_formatter

def __call__(self, form, field):
if field.data not in self.values:
data = field.data if isinstance(field.data, list) else [field.data]
if not any(d in self.values for d in data):
return

message = self.message
Expand Down
15 changes: 15 additions & 0 deletions tests/validators/test_anyof.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,18 @@ def formatter(values):
validator(dummy_form, dummy_field)

assert str(e.value) == "test 9::8::7"


def test_none_multiple_values(dummy_form, dummy_field):
"""
the validator should work with multiple values like produced
by SelectMultiple fields
"""
dummy_field.data = ["a", "e"]
validator = AnyOf(["a", "b", "c"])
validator(dummy_form, dummy_field)

dummy_field.data = ["d", "e"]
validator = AnyOf(["a", "b", "c"])
with pytest.raises(ValueError):
validator(dummy_form, dummy_field)
15 changes: 15 additions & 0 deletions tests/validators/test_noneof.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,18 @@ def test_none_of_raises(dummy_form, dummy_field):
validator = NoneOf(["a", "b", "c"])
with pytest.raises(ValueError):
validator(dummy_form, dummy_field)


def test_none_of_multiple_values(dummy_form, dummy_field):
"""
the validator should work with multiple values like produced
by SelectMultiple fields
"""
dummy_field.data = ["d", "e"]
validator = NoneOf(["a", "b", "c"])
validator(dummy_form, dummy_field)

dummy_field.data = ["a", "e"]
validator = NoneOf(["a", "b", "c"])
with pytest.raises(ValueError):
validator(dummy_form, dummy_field)
Loading