darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4083 from alphagov/bump-wtforms

Browse Source 
Bump WTForms and Flask-WTF to latest versions
This commit is contained in:
Chris Hill-Scott
2021-11-30 18:18:31 +00:00
committed by GitHub
parent 5e8d0623de b74fcf2570
commit 80b645eb8a
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/forms.py
View File

@@ -22,6 +22,7 @@ from werkzeug.utils import cached_property
from wtforms import ( from wtforms import (
BooleanField, BooleanField,
DateField, DateField,
EmailField,
FieldList, FieldList,
FileField, FileField,
HiddenField, HiddenField,
@@ -30,13 +31,14 @@ from wtforms import (
) )
from wtforms import RadioField as WTFormsRadioField from wtforms import RadioField as WTFormsRadioField
from wtforms import ( from wtforms import (
SearchField,
SelectMultipleField, SelectMultipleField,
StringField, StringField,
TelField,
TextAreaField, TextAreaField,
ValidationError, ValidationError,
validators, validators,
) )
from wtforms.fields.html5 import EmailField, SearchField, TelField
from wtforms.validators import URL, DataRequired, Length, Optional, Regexp from wtforms.validators import URL, DataRequired, Length, Optional, Regexp
from app.formatters import format_thousands, guess_name_from_email_address from app.formatters import format_thousands, guess_name_from_email_address
@@ -542,7 +544,7 @@ class RadioFieldWithRequiredMessage(RadioField):
try: try:
return super().pre_validate(form) return super().pre_validate(form)
except ValueError: except ValueError:
raise ValueError(self.required_message) raise ValidationError(self.required_message)
class StripWhitespaceForm(Form): class StripWhitespaceForm(Form):

2
app/main/validators.py
View File

@@ -58,7 +58,7 @@ class ValidEmail:
def __call__(self, form, field): def __call__(self, form, field):
if field.data == '': if not field.data:
return return
try: try:

3
requirements.in
View File

@@ -5,7 +5,8 @@ ago==0.0.93
govuk-bank-holidays==0.8 govuk-bank-holidays==0.8
humanize==3.12.0 humanize==3.12.0
Flask==1.1.2 # pyup: <2 Flask==1.1.2 # pyup: <2
Flask-WTF==0.15.1 Flask-WTF==1.0.0
wtforms==3.0.0
Flask-Login==0.5.0 Flask-Login==0.5.0
werkzeug==2.0.2 werkzeug==2.0.2
jinja2==3.0.2 jinja2==3.0.2

8
requirements.txt
View File

@@ -69,7 +69,7 @@ flask-login==0.5.0
# via -r requirements.in # via -r requirements.in
flask-redis==0.4.0 flask-redis==0.4.0
# via notifications-utils # via notifications-utils
flask-wtf==0.15.1 flask-wtf==1.0.0
# via -r requirements.in # via -r requirements.in
gds-metrics==0.2.4 gds-metrics==0.2.4
# via -r requirements.in # via -r requirements.in
@@ -225,8 +225,10 @@ werkzeug==2.0.2
# via # via
# -r requirements.in # -r requirements.in
# flask # flask
wtforms==2.3.3 wtforms==3.0.0
# via flask-wtf # via
# -r requirements.in
# flask-wtf
xlrd==1.2.0 xlrd==1.2.0
# via pyexcel-xls # via pyexcel-xls
xlwt==1.3.0 xlwt==1.3.0