Commit 0fe8c20a authored by Karen Tracey's avatar Karen Tracey
Browse files

Fixed #12146: Corrected Canadian postal code validation. Thanks paulschreiber and Mark Lavin. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 92eec3ef

django/contrib/localflavor/ca/forms.py

+9 −2
Original line number Diff line number Diff line
@@ -12,13 +12,20 @@ phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$') 
sin_re = re.compile(r"^(\d{3})-(\d{3})-(\d{3})$")



class CAPostalCodeField(RegexField):

    """Canadian postal code field."""

    """

    Canadian postal code field.



    Validates against known invalid characters: D, F, I, O, Q, U

    Additionally the first character cannot be Z or W.

    For more info see:

    http://www.canadapost.ca/tools/pg/manual/PGaddress-e.asp#1402170

    """

    default_error_messages = {

        'invalid': _(u'Enter a postal code in the format XXX XXX.'),

    }



    def __init__(self, *args, **kwargs):

        super(CAPostalCodeField, self).__init__(r'^[ABCEGHJKLMNPRSTVXYZ]\d[A-Z] \d[A-Z]\d$',

        super(CAPostalCodeField, self).__init__(r'^[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ] \d[ABCEGHJKLMNPRSTVWXYZ]\d$',

            max_length=None, min_length=None, *args, **kwargs)



class CAPhoneNumberField(Field):

tests/regressiontests/forms/localflavor/ca.py

+44 −0
Original line number Diff line number Diff line
@@ -60,6 +60,50 @@ ValidationError: [u'Enter a postal code in the format XXX XXX.'] 
u''

>>> f.clean('')

u''

>>> f.clean('W2S 2H3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('T2W 2H7')

u'T2W 2H7'

>>> f.clean('T2S 2W7')

u'T2S 2W7'

>>> f.clean('Z2S 2H3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('T2Z 2H7')

u'T2Z 2H7'

>>> f.clean('T2S 2Z7')

u'T2S 2Z7'

>>> f.clean('F2S 2H3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('A2S 2D3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('A2I 2R3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('A2I 2R3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('A2Q 2R3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('U2B 2R3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']

>>> f.clean('O2B 2R3')

Traceback (most recent call last):

...

ValidationError: [u'Enter a postal code in the format XXX XXX.']



# CAPhoneNumberField ##########################################################