Ticket #722: username.patch

django/core/validators.py

@@ -29 +29 @@
 phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNORECASE)
 slug_re = re.compile(r'^[-\w]+$')
 url_re = re.compile(r'^https?://\S+$')
+username_re = re.compile(r'^[-\w.@+]+$')
 
 lazy_inter = lazy(lambda a,b: str(a) % b, str)
 
@@ -58 +59 @@
     def __str__(self):
         return str(self.messages)
 
+def isUserName(field_data, all_data):
+    if not username_re.search(field_data):
+        raise ValidationError, "This value must contain only letters, numbers and underscores, dashes, . and @."
+
 def isAlphaNumeric(field_data, all_data):
     if not alnum_re.search(field_data):
         raise ValidationError, gettext("This value must contain only letters, numbers and underscores.")

django/contrib/auth/models.py

@@ -87 +87 @@
 
     Username and password are required. Other fields are optional.
     """
-    username = models.CharField(_('username'), maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric], help_text=_("Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."))
+    username = models.CharField(_('username'), maxlength=30, unique=True, validator_list=[validators.isUserName], help_text=_("Required. 30 characters or fewer. Letters, digits, dash, period, @ and underscores."))
     first_name = models.CharField(_('first name'), maxlength=30, blank=True)
     last_name = models.CharField(_('last name'), maxlength=30, blank=True)
     email = models.EmailField(_('e-mail address'), blank=True)