Commit 9e124926 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.3.X] Fixed #17100 -- Typo in the regex for EmailValidator. Backport of r17349 from trunk. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a9789c0d

django/core/validators.py

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ class EmailValidator(RegexValidator): 


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

    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5

    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'

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

validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')

tests/modeltests/validators/tests.py

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ TEST_DATA = ( 
    (validate_email, 'abc', ValidationError),

    (validate_email, 'a @x.cz', ValidationError),

    (validate_email, 'something@@somewhere.com', ValidationError),

    # Quoted-string format (CR not allowed)

    (validate_email, '"\\\011"@here.com', None),

    (validate_email, '"\\\012"@here.com', ValidationError),



    (validate_slug, 'slug-ok', None),

    (validate_slug, 'longer-slug-still-ok', None),