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

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 33e1f45c95cff95f2399dddb87a6e6fca086171e..599b2576d562156dfafc94c54754c488f16152b9 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -18,33 +18,7 @@ import wtforms
 
 from mediagoblin.tools.mail import normalize_email
 from mediagoblin.tools.translate import lazy_pass_to_ugettext 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.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):

diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
new file mode 100644 (file)
index 0000000..1b30a7d
--- /dev/null
+++ b/mediagoblin/auth/tools.py
@@ -0,0 +1,50 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import wtforms
+
+from mediagoblin.tools.mail import normalize_email
+from mediagoblin.tools.translate import lazy_pass_to_ugettext 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