moved normalize_user_or_email_field to auth/tools.py from auth/forms.py

[mediagoblin.git] / mediagoblin / auth / forms.py

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 8f091d2143a5aaae8586cb380a25cca606ccb9b3..599b2576d562156dfafc94c54754c488f16152b9 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -17,34 +17,8 @@
 import wtforms
 
 from mediagoblin.tools.mail import normalize_email
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
-
-def normalize_user_or_email_field(allow_email=True, allow_user=True):
-    """Check if we were passed a field that matches a username and/or email pattern
-
-    This is useful for fields that can take either a username or email
-    address. Use the parameters if you want to only allow a username for
-    instance"""
-    message = _(u'Invalid User name or email address.')
-    nomail_msg = _(u"This field does not take email addresses.")
-    nouser_msg = _(u"This field requires an email address.")
-
-    def _normalize_field(form, field):
-        email = u'@' in field.data
-        if email: # normalize email address casing
-            if not allow_email:
-                raise wtforms.ValidationError(nomail_msg)
-            wtforms.validators.Email()(form, field)
-            field.data = normalize_email(field.data)
-        else: # lower case user names
-            if not allow_user:
-                raise wtforms.ValidationError(nouser_msg)
-            wtforms.validators.Length(min=3, max=30)(form, field)
-            wtforms.validators.Regexp(r'^\w+$')(form, field)
-            field.data = field.data.lower()
-        if field.data is None: # should not happen, but be cautious anyway
-            raise wtforms.ValidationError(message)
-    return _normalize_field
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):
@@ -64,9 +38,9 @@ class RegistrationForm(wtforms.Form):
 
 class LoginForm(wtforms.Form):
     username = wtforms.TextField(
-        _('Username'),
+        _('Username or Email'),
         [wtforms.validators.Required(),
-         normalize_user_or_email_field(allow_email=False)])
+         normalize_user_or_email_field()])
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),