Ticket #899: 899_fix_wtforms_required_to_inputrequired.patch

File 899_fix_wtforms_required_to_inputrequired.patch, 13.7 KB (added by loic_le.ninan, 10 years ago)

This patch switches from Required to InputRequired (and not DataRequired as suggested by the warning message), following the documentation's recommandation here : ​http://wtforms.readthedocs.org/en/latest/validators.html#wtforms.validators.DataRequired

  • mediagoblin/edit/forms.py 

    From e85efe5e6a4da96452ec030fdefd8d0883b5097e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Ninan?= <loic.leninan@gmail.com>
Date: Mon, 9 Jun 2014 15:14:23 +0200
Subject: [PATCH] Fixes #899 : DeprecationWarning about Required going away in
 WTForms 3.0. Replaced Required with InputRequired.

---
 mediagoblin/edit/forms.py               |   14 +++++++-------
 mediagoblin/meddleware/csrf.py          |    2 +-
 mediagoblin/plugins/basic_auth/forms.py |   18 +++++++++---------
 mediagoblin/plugins/ldap/forms.py       |    8 ++++----
 mediagoblin/plugins/oauth/forms.py      |    8 ++++----
 mediagoblin/plugins/openid/forms.py     |    8 ++++----
 mediagoblin/plugins/persona/forms.py    |    8 ++++----
 mediagoblin/plugins/piwigo/forms.py     |    2 +-
 mediagoblin/submit/forms.py             |    2 +-
 mediagoblin/user_pages/forms.py         |    6 +++---
 10 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 7c390a3..c0bece8 100644
    a b class EditForm(wtforms.Form):  
    4040            "Separate tags by commas."))
    4141    slug = wtforms.TextField(
    4242        _('Slug'),
    43         [wtforms.validators.Required(message=_("The slug can't be empty"))],
     43        [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
    4444        description=_(
    4545            "The title part of this media's address. "
    4646            "You usually don't need to change this."))
    … … class EditAttachmentsForm(wtforms.Form):  
    8787class EditCollectionForm(wtforms.Form):
    8888    title = wtforms.TextField(
    8989        _('Title'),
    90         [wtforms.validators.Length(min=0, max=500), wtforms.validators.Required(message=_("The title can't be empty"))])
     90        [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired(message=_("The title can't be empty"))])
    9191    description = wtforms.TextAreaField(
    9292        _('Description of this collection'),
    9393        description=_("""You can use
    … … class EditCollectionForm(wtforms.Form):  
    9595                      Markdown</a> for formatting."""))
    9696    slug = wtforms.TextField(
    9797        _('Slug'),
    98         [wtforms.validators.Required(message=_("The slug can't be empty"))],
     98        [wtforms.validators.InputRequired(message=_("The slug can't be empty"))],
    9999        description=_(
    100100            "The title part of this collection's address. "
    101101            "You usually don't need to change this."))
    … … class EditCollectionForm(wtforms.Form):  
    104104class ChangePassForm(wtforms.Form):
    105105    old_password = wtforms.PasswordField(
    106106        _('Old password'),
    107         [wtforms.validators.Required()],
     107        [wtforms.validators.InputRequired()],
    108108        description=_(
    109109            "Enter your old password to prove you own this account."))
    110110    new_password = wtforms.PasswordField(
    111111        _('New password'),
    112         [wtforms.validators.Required(),
     112        [wtforms.validators.InputRequired(),
    113113         wtforms.validators.Length(min=6, max=30)],
    114114        id="password")
    115115
    … … class ChangePassForm(wtforms.Form):  
    117117class ChangeEmailForm(wtforms.Form):
    118118    new_email = wtforms.TextField(
    119119        _('New email address'),
    120         [wtforms.validators.Required(),
     120        [wtforms.validators.InputRequired(),
    121121         normalize_user_or_email_field(allow_user=False)])
    122122    password = wtforms.PasswordField(
    123123        _('Password'),
    124         [wtforms.validators.Required()],
     124        [wtforms.validators.InputRequired()],
    125125        description=_(
    126126            "Enter your password to prove you own this account."))
    127127

  • mediagoblin/meddleware/csrf.py 

    diff --git a/mediagoblin/meddleware/csrf.py b/mediagoblin/meddleware/csrf.py
index 44d42d7..6cad6fa 100644
    a b class CsrfForm(Form):  
    4646    is included in the POST."""
    4747
    4848    csrf_token = HiddenField("",
    49                              [validators.Required()])
     49                             [validators.InputRequired()])
    5050
    5151
    5252def render_csrf_form_token(request):

  • mediagoblin/plugins/basic_auth/forms.py 

    diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py
index c10496f..42b84bf 100644
    a b from mediagoblin.auth.tools import normalize_user_or_email_field  
    2222class RegistrationForm(wtforms.Form):
    2323    username = wtforms.TextField(
    2424        _('Username'),
    25         [wtforms.validators.Required(),
     25        [wtforms.validators.InputRequired(),
    2626         normalize_user_or_email_field(allow_email=False)])
    2727    password = wtforms.PasswordField(
    2828        _('Password'),
    29         [wtforms.validators.Required(),
     29        [wtforms.validators.InputRequired(),
    3030         wtforms.validators.Length(min=5, max=1024)])
    3131    email = wtforms.TextField(
    3232        _('Email address'),
    33         [wtforms.validators.Required(),
     33        [wtforms.validators.InputRequired(),
    3434         normalize_user_or_email_field(allow_user=False)])
    3535
    3636
    3737class LoginForm(wtforms.Form):
    3838    username = wtforms.TextField(
    3939        _('Username or Email'),
    40         [wtforms.validators.Required(),
     40        [wtforms.validators.InputRequired(),
    4141         normalize_user_or_email_field()])
    4242    password = wtforms.PasswordField(
    4343        _('Password'))
    … … class LoginForm(wtforms.Form):  
    4949class ForgotPassForm(wtforms.Form):
    5050    username = wtforms.TextField(
    5151        _('Username or email'),
    52         [wtforms.validators.Required(),
     52        [wtforms.validators.InputRequired(),
    5353         normalize_user_or_email_field()])
    5454
    5555
    5656class ChangeForgotPassForm(wtforms.Form):
    5757    password = wtforms.PasswordField(
    5858        'Password',
    59         [wtforms.validators.Required(),
     59        [wtforms.validators.InputRequired(),
    6060         wtforms.validators.Length(min=5, max=1024)])
    6161    token = wtforms.HiddenField(
    6262        '',
    63         [wtforms.validators.Required()])
     63        [wtforms.validators.InputRequired()])
    6464
    6565
    6666class ChangePassForm(wtforms.Form):
    6767    old_password = wtforms.PasswordField(
    6868        _('Old password'),
    69         [wtforms.validators.Required()],
     69        [wtforms.validators.InputRequired()],
    7070        description=_(
    7171            "Enter your old password to prove you own this account."))
    7272    new_password = wtforms.PasswordField(
    7373        _('New password'),
    74         [wtforms.validators.Required(),
     74        [wtforms.validators.InputRequired(),
    7575         wtforms.validators.Length(min=6, max=30)],
    7676        id="password")

  • mediagoblin/plugins/ldap/forms.py 

    diff --git a/mediagoblin/plugins/ldap/forms.py b/mediagoblin/plugins/ldap/forms.py
index 7ec1479..1f1439a 100644
    a b from mediagoblin.auth.tools import normalize_user_or_email_field  
    2222class RegisterForm(wtforms.Form):
    2323    username = wtforms.HiddenField(
    2424        '',
    25         [wtforms.validators.Required(),
     25        [wtforms.validators.InputRequired(),
    2626         normalize_user_or_email_field(allow_email=False)])
    2727    email = wtforms.TextField(
    2828        _('Email address'),
    29         [wtforms.validators.Required(),
     29        [wtforms.validators.InputRequired(),
    3030         normalize_user_or_email_field(allow_user=False)])
    3131
    3232
    3333class LoginForm(wtforms.Form):
    3434    username = wtforms.TextField(
    3535        _('Username'),
    36         [wtforms.validators.Required(),
     36        [wtforms.validators.InputRequired(),
    3737         normalize_user_or_email_field()])
    3838    password = wtforms.PasswordField(
    3939        _('Password'),
    40         [wtforms.validators.Required()])
     40        [wtforms.validators.InputRequired()])

  • mediagoblin/plugins/oauth/forms.py 

    diff --git a/mediagoblin/plugins/oauth/forms.py b/mediagoblin/plugins/oauth/forms.py
index 5edd992..ddf4d39 100644
    a b from mediagoblin.tools.translate import lazy_pass_to_ugettext as _  
    2424
    2525class AuthorizationForm(wtforms.Form):
    2626    client_id = wtforms.HiddenField(u'',
    27                                     validators=[wtforms.validators.Required()])
    28     next = wtforms.HiddenField(u'', validators=[wtforms.validators.Required()])
     27                                    validators=[wtforms.validators.InputRequired()])
     28    next = wtforms.HiddenField(u'', validators=[wtforms.validators.InputRequired()])
    2929    allow = wtforms.SubmitField(_(u'Allow'))
    3030    deny = wtforms.SubmitField(_(u'Deny'))
    3131
    3232
    3333class ClientRegistrationForm(wtforms.Form):
    34     name = wtforms.TextField(_('Name'), [wtforms.validators.Required()],
     34    name = wtforms.TextField(_('Name'), [wtforms.validators.InputRequired()],
    3535            description=_('The name of the OAuth client'))
    3636    description = wtforms.TextAreaField(_('Description'),
    3737            [wtforms.validators.Length(min=0, max=500)],
    3838            description=_('''This will be visible to users allowing your
    3939                application to authenticate as them.'''))
    4040    type = wtforms.SelectField(_('Type'),
    41             [wtforms.validators.Required()],
     41            [wtforms.validators.InputRequired()],
    4242            choices=[
    4343                ('confidential', 'Confidential'),
    4444                ('public', 'Public')],

  • mediagoblin/plugins/openid/forms.py 

    diff --git a/mediagoblin/plugins/openid/forms.py b/mediagoblin/plugins/openid/forms.py
index f26024b..d47369d 100644
    a b from mediagoblin.auth.tools import normalize_user_or_email_field  
    2222class RegistrationForm(wtforms.Form):
    2323    openid = wtforms.HiddenField(
    2424        '',
    25         [wtforms.validators.Required()])
     25        [wtforms.validators.InputRequired()])
    2626    username = wtforms.TextField(
    2727        _('Username'),
    28         [wtforms.validators.Required(),
     28        [wtforms.validators.InputRequired(),
    2929         normalize_user_or_email_field(allow_email=False)])
    3030    email = wtforms.TextField(
    3131        _('Email address'),
    32         [wtforms.validators.Required(),
     32        [wtforms.validators.InputRequired(),
    3333         normalize_user_or_email_field(allow_user=False)])
    3434
    3535
    3636class LoginForm(wtforms.Form):
    3737    openid = wtforms.TextField(
    3838        _('OpenID'),
    39         [wtforms.validators.Required(),
     39        [wtforms.validators.InputRequired(),
    4040         # Can openid's only be urls?
    4141         wtforms.validators.URL(message='Please enter a valid url.')])

  • mediagoblin/plugins/persona/forms.py 

    diff --git a/mediagoblin/plugins/persona/forms.py b/mediagoblin/plugins/persona/forms.py
index 608be0c..7d63234 100644
    a b from mediagoblin.auth.tools import normalize_user_or_email_field  
    2222class RegistrationForm(wtforms.Form):
    2323    username = wtforms.TextField(
    2424        _('Username'),
    25         [wtforms.validators.Required(),
     25        [wtforms.validators.InputRequired(),
    2626         normalize_user_or_email_field(allow_email=False)])
    2727    email = wtforms.TextField(
    2828        _('Email address'),
    29         [wtforms.validators.Required(),
     29        [wtforms.validators.InputRequired(),
    3030         normalize_user_or_email_field(allow_user=False)])
    3131    persona_email = wtforms.HiddenField(
    3232        '',
    33         [wtforms.validators.Required(),
     33        [wtforms.validators.InputRequired(),
    3434         normalize_user_or_email_field(allow_user=False)])
    3535
    3636
    3737class EditForm(wtforms.Form):
    3838    email = wtforms.TextField(
    3939        _('Email address'),
    40         [wtforms.validators.Required(),
     40        [wtforms.validators.InputRequired(),
    4141         normalize_user_or_email_field(allow_user=False)])

  • mediagoblin/plugins/piwigo/forms.py 

    diff --git a/mediagoblin/plugins/piwigo/forms.py b/mediagoblin/plugins/piwigo/forms.py
index fb04aa6..fd545a3 100644
    a b _md5_validator = wtforms.validators.Regexp(r"^[0-9a-fA-F]{32}$")  
    3434class AddForm(wtforms.Form):
    3535    original_sum = wtforms.TextField(None,
    3636        [_md5_validator,
    37          wtforms.validators.Required()])
     37         wtforms.validators.InputRequired()])
    3838    thumbnail_sum = wtforms.TextField(None,
    3939        [wtforms.validators.Optional(),
    4040         _md5_validator])

  • mediagoblin/submit/forms.py 

    diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index e226464..6c0e8e9 100644
    a b def get_submit_start_form(form, **kwargs):  
    5959class AddCollectionForm(wtforms.Form):
    6060    title = wtforms.TextField(
    6161        _('Title'),
    62         [wtforms.validators.Length(min=0, max=500), wtforms.validators.Required()])
     62        [wtforms.validators.Length(min=0, max=500), wtforms.validators.InputRequired()])
    6363    description = wtforms.TextAreaField(
    6464        _('Description of this collection'),
    6565        description=_("""You can use

  • mediagoblin/user_pages/forms.py 

    diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index eb786f4..1a09864 100644
    a b from mediagoblin.tools.translate import lazy_pass_to_ugettext as _  
    2121class MediaCommentForm(wtforms.Form):
    2222    comment_content = wtforms.TextAreaField(
    2323        _('Comment'),
    24         [wtforms.validators.Required()],
     24        [wtforms.validators.InputRequired()],
    2525        description=_(u'You can use '
    2626                      u'<a href="http://daringfireball.net/projects/markdown/basics" target="_blank">'
    2727                      u'Markdown</a> for formatting.'))
    … … class MediaCollectForm(wtforms.Form):  
    5353class CommentReportForm(wtforms.Form):
    5454    report_reason = wtforms.TextAreaField(
    5555        _('Reason for Reporting'),
    56         [wtforms.validators.Required()])
     56        [wtforms.validators.InputRequired()])
    5757    reporter_id = wtforms.HiddenField('')
    5858
    5959class MediaReportForm(wtforms.Form):
    6060    report_reason = wtforms.TextAreaField(
    6161        _('Reason for Reporting'),
    62         [wtforms.validators.Required()])
     62        [wtforms.validators.InputRequired()])
    6363    reporter_id = wtforms.HiddenField('')