diff options
author | Jef van Schendel <mail@jefvanschendel.nl> | 2011-12-13 15:15:57 +0100 |
---|---|---|
committer | Jef van Schendel <mail@jefvanschendel.nl> | 2011-12-13 15:15:57 +0100 |
commit | bb3b9e4090706e1e9815c5132c01b9e706e31360 (patch) | |
tree | f6a1eb6c0db46bd445bdd67128181206f735b5a8 /mediagoblin/auth/forms.py | |
parent | d44140a212fddab3301cbf3a97d3197f8879277b (diff) | |
parent | b27067371d6cb99cf21c7c0970b664e970d9a22d (diff) | |
download | mediagoblin-bb3b9e4090706e1e9815c5132c01b9e706e31360.tar.lz mediagoblin-bb3b9e4090706e1e9815c5132c01b9e706e31360.tar.xz mediagoblin-bb3b9e4090706e1e9815c5132c01b9e706e31360.zip |
Merge jQuery branch, resolve conflicts
Diffstat (limited to 'mediagoblin/auth/forms.py')
-rw-r--r-- | mediagoblin/auth/forms.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py index dcb6766c..4cd3e9d8 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/auth/forms.py @@ -29,15 +29,7 @@ class RegistrationForm(wtforms.Form): password = wtforms.PasswordField( _('Password'), [wtforms.validators.Required(), - wtforms.validators.Length(min=6, max=30), - wtforms.validators.EqualTo( - 'confirm_password', - _('Passwords must match.'))]) - confirm_password = wtforms.PasswordField( - _('Confirm password'), - [wtforms.validators.Required()], - description=_( - u"Type it again here to make sure there are no spelling mistakes.")) + wtforms.validators.Length(min=6, max=30)]) email = wtforms.TextField( _('Email address'), [wtforms.validators.Required(), |