Ticket #12005: email.patch

django/forms/fields.py

@@ -418 +418 @@
             raise ValidationError(self.error_messages['invalid'])
         return value
 
-email_re = re.compile(
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
-    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-    r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
+email_re = re.compile(r"""^                     # start-of-line
+    (
+        [-!#$%&'*+/=?^_`{}|~0-9A-Z]+
+        (\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*       # dot-atom
+    |
+        "([\001-\010\013\014\016-\037!#-\[\]-\177]
+        |\\[\001-011\013\014\016-\177])*"       # quoted-string
+    )                                           # user
+    @
+    ((?:[A-Z0-9]|[A-Z0-9]-+(?=[A-Z0-9]))+\.)*   # subdomains
+    (?:[A-Z0-9](?:[A-Z0-9]|-+(?=[A-Z0-9]))+\.)+ # domain
+    [A-Z]{2,6}                                  # TLD
+    $                                           # end of line
+    """, re.IGNORECASE | re.VERBOSE)  # domain
 
 class EmailField(RegexField):
     default_error_messages = {

tests/regressiontests/forms/fields.py

@@ -767 +767 @@
 >>> f.clean('example@valid-with-hyphens.com')
 u'example@valid-with-hyphens.com'
 
+>>> f.clean('example@a.single.letter.subdomain.com')
+u'example@a.single.letter.subdomain.com'
+
 # Check for runaway regex security problem. This will take for-freeking-ever
 # if the security fix isn't in place.
 >>> f.clean('viewx3dtextx26qx3d@yahoo.comx26latlngx3d15854521645943074058')