Ticket #722: username_re.patch

core/validators.py

@@ -23 +23 @@
 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'^http://\S+$')
+username_re = re.compile(r'^[-\w.@+]+$')
 
 from django.conf.settings import JING_PATH
 
@@ -52 +53 @@
     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, "This value must contain only letters, numbers and underscores."

models/auth.py

@@ -25 +25 @@
         return self.name
 
 class User(meta.Model):
-    username = meta.CharField(maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric])
+    username = meta.CharField(maxlength=30, unique=True, validator_list=[validators.isUserName])
     first_name = meta.CharField(maxlength=30, blank=True)
     last_name = meta.CharField(maxlength=30, blank=True)
     email = meta.EmailField('e-mail address', blank=True)