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.

Sign up for GitHub

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

Jump to bottom

fix: wtforms compat 3.1.0 #2138

Merged
merged 3 commits into from
Oct 16, 2023
Merged

fix: wtforms compat 3.1.0 #2138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
588dc86
fix: WTForms compat with 3.1.0
dpgaspar Oct 15, 2023
005dfdf
fix for multiple also
dpgaspar Oct 15, 2023
979472f
Merge branch 'master' into fix/wtforms-compat-3.1.0
dpgaspar Oct 16, 2023
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
19 changes: 16 additions & 3 deletions flask_appbuilder/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import operator

from packaging import version
import wtforms
from wtforms import widgets
from wtforms.fields import Field, SelectField, SelectFieldBase
from wtforms.validators import ValidationError

IS_WTFORMS_LESS_THEN_3_1_0 = version.parse(wtforms.__version__) < version.parse("3.1.0")


class AJAXSelectField(Field):
"""
Expand Down Expand Up @@ -130,10 +134,16 @@

def iter_choices(self):
if self.allow_blank:
yield ("__None", self.blank_text, self.data is None)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield ("__None", self.blank_text, self.data is None)
else:
yield ("__None", self.blank_text, self.data is None, {})

Check warning on line 140 in flask_appbuilder/fields.py

View check run for this annotation

Codecov / codecov/patch

flask_appbuilder/fields.py#L140 

Added line #L140 was not covered by tests

for pk, obj in self._get_object_list():
yield (pk, self.get_label(obj), obj == self.data)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield (pk, self.get_label(obj), obj == self.data)
else:
yield (pk, self.get_label(obj), obj == self.data, {})

Check warning on line 146 in flask_appbuilder/fields.py

View check run for this annotation

Codecov / codecov/patch

flask_appbuilder/fields.py#L146 

Added line #L146 was not covered by tests

def process_formdata(self, valuelist):
if valuelist:
Expand Down Expand Up @@ -203,7 +213,10 @@

def iter_choices(self):
for pk, obj in self._get_object_list():
yield (pk, self.get_label(obj), obj in self.data)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield (pk, self.get_label(obj), obj in self.data)
else:
yield (pk, self.get_label(obj), obj in self.data, {})

Check warning on line 219 in flask_appbuilder/fields.py

View check run for this annotation

Codecov / codecov/patch

flask_appbuilder/fields.py#L219 

Added line #L219 was not covered by tests

def process_formdata(self, valuelist):
self._formdata = set(valuelist)
Expand Down
Loading