Commit 5f20587f authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #9890 -- Modified the regex validation for email addresses to... 

[1.0.X] Fixed #9890 -- Modified the regex validation for email addresses to match RFC822/1035. Thanks to ozgur for the report, and kratorius for the patch.

Merge of 10573 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 33eca69b

django/forms/fields.py

+4 −4
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ class RegexField(CharField): 
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-Z]{2,6}$', re.IGNORECASE)  # domain

    r')@(?:[A-Z0-9]+(?:-*[A-Z0-9]+)*\.)+[A-Z]{2,6}$', re.IGNORECASE)  # domain



class EmailField(RegexField):

    default_error_messages = {

tests/regressiontests/forms/fields.py

+23 −2
Original line number Diff line number Diff line
@@ -745,6 +745,27 @@ ValidationError: [u'Enter a valid e-mail address.'] 
Traceback (most recent call last):

...

ValidationError: [u'Enter a valid e-mail address.']

>>> f.clean('example@invalid-.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid e-mail address.']

>>> f.clean('example@-invalid.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid e-mail address.']

>>> f.clean('example@inv-.alid-.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid e-mail address.']

>>> f.clean('example@inv-.-alid.com')

Traceback (most recent call last):

...

ValidationError: [u'Enter a valid e-mail address.']

>>> f.clean('example@valid-----hyphens.com')

u'example@valid-----hyphens.com'



>>> f.clean('example@valid-with-hyphens.com')

u'example@valid-with-hyphens.com'



>>> f = EmailField(required=False)

>>> f.clean('')