Ticket #12196: 12196-2.diff

django/forms/fields.py

@@ -419 +419 @@
         return value
 
 email_re = re.compile(
-    r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
+    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
 

tests/regressiontests/forms/fields.py

@@ -767 +767 @@
 >>> f.clean('example@valid-with-hyphens.com')
 u'example@valid-with-hyphens.com'
 
+>>> f.clean('example...99@valid.com')
+u'example...99@valid.com'
+
+>>> f.clean('example.@invalid.com')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid e-mail address.']
+
 # 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')