almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-05 20:51:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support WTForms 3

Browse source
This commit is contained in:
Glandos 2021-11-12 23:33:31 +01:00
parent c904f5a972
commit 632dff8c60
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ihatemoney/api/common.py
View file

@ -3,7 +3,7 @@ from functools import wraps
from flask import current_app, request from flask import current_app, request
from flask_restful import Resource, abort from flask_restful import Resource, abort
from werkzeug.security import check_password_hash from werkzeug.security import check_password_hash
from wtforms.fields.core import BooleanField from wtforms.fields import BooleanField
from ihatemoney.forms import EditProjectForm, MemberForm, ProjectForm, get_billform_for from ihatemoney.forms import EditProjectForm, MemberForm, ProjectForm, get_billform_for
from ihatemoney.models import Bill, Person, Project, db from ihatemoney.models import Bill, Person, Project, db

19
ihatemoney/forms.py
View file

@ -9,9 +9,22 @@ from flask_wtf.file import FileAllowed, FileField, FileRequired
from flask_wtf.form import FlaskForm from flask_wtf.form import FlaskForm
from markupsafe import Markup from markupsafe import Markup
from werkzeug.security import check_password_hash, generate_password_hash from werkzeug.security import check_password_hash, generate_password_hash
from wtforms.fields.core import Label, SelectField, SelectMultipleField from wtforms.fields import (
from wtforms.fields.html5 import DateField, DecimalField, URLField BooleanField,
from wtforms.fields.simple import BooleanField, PasswordField, StringField, SubmitField DateField,
DecimalField,
Label,
PasswordField,
SelectField,
SelectMultipleField,
StringField,
SubmitField,
)
try:
# Compat for WTForms <= 2.3.3
from wtforms.fields.html5 import URLField
except ModuleNotFoundError:
from wtforms.fields import URLField
from wtforms.validators import ( from wtforms.validators import (
URL, URL,
DataRequired, DataRequired,

4
ihatemoney/tests/api_test.py
View file

@ -539,7 +539,7 @@ class APITestCase(IhatemoneyTestCase):
"amount": expected_amount, "amount": expected_amount,
"date": "2011-08-10", "date": "2011-08-10",
"id": id, "id": id,
"external_link": "", "external_link": None,
"original_currency": "XXX", "original_currency": "XXX",
"converted_amount": expected_amount, "converted_amount": expected_amount,
} }
@ -834,7 +834,7 @@ class APITestCase(IhatemoneyTestCase):
"amount": 25.0, "amount": 25.0,
"date": "2011-08-10", "date": "2011-08-10",
"id": 1, "id": 1,
"external_link": "", "external_link": None,
"converted_amount": 25.0, "converted_amount": 25.0,
"original_currency": "XXX", "original_currency": "XXX",
} }

2
setup.cfg
View file

@ -35,7 +35,7 @@ install_requires =
Flask-SQLAlchemy>=2.4,<3 Flask-SQLAlchemy>=2.4,<3
Flask-Talisman>=0.8,<1 Flask-Talisman>=0.8,<1
Flask-WTF>=0.14.3,<2 Flask-WTF>=0.14.3,<2
WTForms>=2.3.1,<2.4 WTForms>=2.3.1,<3.1
Flask>=2,<3 Flask>=2,<3
itsdangerous>=2,<3 itsdangerous>=2,<3
Jinja2>=3,<4 Jinja2>=3,<4