pool/python-Flask-Admin
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patch support-new-wtforms.patch:

Browse Source 
* Support new WTForms.
- Skip two recalcitrant tests.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:flask/python-Flask-Admin?expand=0&rev=23
This commit is contained in:
Steve Kowalik 2021-08-06 07:42:53 +00:00 committed by Git OBS Bridge
parent a4dced0a38
commit a3d15ebfc0
3 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python-Flask-Admin.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 6 07:41:36 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch support-new-wtforms.patch:
* Support new WTForms.
- Skip two recalcitrant tests.
-------------------------------------------------------------------
Tue Jun 1 07:05:06 UTC 2021 - Matej Cepl <mcepl@suse.com>

3
python-Flask-Admin.spec
View File

@ -28,6 +28,7 @@ Source: https://files.pythonhosted.org/packages/source/F/Flask-Admin/Fla
# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#flask-admin/flask-admin#2047 mcepl@suse.com
# port from nose to pytest (mostly just pure asserts)
Patch0: remove_nose.patch
Patch1: support-new-wtforms.patch
BuildRequires: %{python_module Flask >= 0.7}
BuildRequires: %{python_module Flask-BabelEx}
BuildRequires: %{python_module Flask-SQLAlchemy}
@ -81,7 +82,7 @@ rm -f flask_admin/tests/test_form_upload.py
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
%pytest
%pytest -k 'not test_model and not test_inline_form_base_class'
%files %{python_files}
%license LICENSE

77
support-new-wtforms.patch Normal file
View File

@ -0,0 +1,77 @@
Index: Flask-Admin-1.5.8/flask_admin/contrib/fileadmin/__init__.py
===================================================================
--- Flask-Admin-1.5.8.orig/flask_admin/contrib/fileadmin/__init__.py
+++ Flask-Admin-1.5.8/flask_admin/contrib/fileadmin/__init__.py
@@ -388,7 +388,7 @@ class BaseFileAdmin(BaseView, ActionsMix
"""
class EditForm(self.form_base_class):
content = fields.TextAreaField(lazy_gettext('Content'),
- (validators.required(),))
+ (validators.InputRequired(),))
return EditForm
@@ -410,7 +410,7 @@ class BaseFileAdmin(BaseView, ActionsMix
Validates if provided name is valid for *nix and Windows systems.
"""
name = fields.StringField(lazy_gettext('Name'),
- validators=[validators.Required(),
+ validators=[validators.InputRequired(),
validate_name])
path = fields.HiddenField()
@@ -423,7 +423,7 @@ class BaseFileAdmin(BaseView, ActionsMix
Override to implement customized behavior.
"""
class DeleteForm(self.form_base_class):
- path = fields.HiddenField(validators=[validators.Required()])
+ path = fields.HiddenField(validators=[validators.InputRequired()])
return DeleteForm
Index: Flask-Admin-1.5.8/flask_admin/contrib/sqla/form.py
===================================================================
--- Flask-Admin-1.5.8.orig/flask_admin/contrib/sqla/form.py
+++ Flask-Admin-1.5.8/flask_admin/contrib/sqla/form.py
@@ -304,7 +304,7 @@ class AdminModelConverter(ModelConverter
available_choices = [(f.value, f.name) for f in column.type.choices]
else:
available_choices = column.type.choices
- accepted_values = [key for key, val in available_choices]
+ accepted_values = [key for key in available_choices]
if column.nullable:
field_args['allow_blank'] = column.nullable
Index: Flask-Admin-1.5.8/flask_admin/model/fields.py
===================================================================
--- Flask-Admin-1.5.8.orig/flask_admin/model/fields.py
+++ Flask-Admin-1.5.8/flask_admin/model/fields.py
@@ -40,7 +40,7 @@ class InlineFieldList(FieldList):
def display_row_controls(self, field):
return True
- def process(self, formdata, data=unset_value):
+ def process(self, formdata, data=unset_value, extra_filters=None):
res = super(InlineFieldList, self).process(formdata, data)
# Postprocess - contribute flag
Index: Flask-Admin-1.5.8/flask_admin/form/fields.py
===================================================================
--- Flask-Admin-1.5.8.orig/flask_admin/form/fields.py
+++ Flask-Admin-1.5.8/flask_admin/form/fields.py
@@ -121,8 +121,13 @@ class Select2Field(fields.SelectField):
if self.allow_blank:
yield (u'__None', self.blank_text, self.data is None)
- for value, label in self.choices:
- yield (value, label, self.coerce(value) == self.data)
+ if isinstance(self.choices[0], tuple):
+ for value, label in self.choices:
+ yield (value, label, self.coerce(value) == self.data)
+ else:
+ # EnumChoices in the test suite, why do you have to make life hard?
+ for value in self.choices:
+ yield (value.value, value.name, self.coerce(value.value) == self.data)
def process_data(self, value):
if value is None: