Ticket #8527: ca-form.diff

django/contrib/localflavor/ca/forms.py

@@ -3 +3 @@
 """
 
 from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
+from django.forms.fields import Field, CharField, Select, EMPTY_VALUES
 from django.forms.util import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 import re
@@ -11 +11 @@
 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):
+class CAPostalCodeField(CharField):
     """Canadian postal code field."""
     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$',
-            max_length=None, min_length=None, *args, **kwargs)
+    postcode_regex = re.compile(r'^([ABCEGHJKLMNPRSTVXYZ]\d[A-Z]) *(\d[A-Z]\d)$')
 
+    def clean(self, value):
+        value = super(CAPostalCodeField, self).clean(value)
+        if value == u'':
+            return value
+        postcode = value.upper().strip()
+        m = self.postcode_regex.match(postcode)
+        if not m:
+            raise ValidationError(self.default_error_messages['invalid'])
+
+        return "%s %s" % (m.group(1), m.group(2))
+
 class CAPhoneNumberField(Field):
     """Canadian phone number field."""
     default_error_messages = {

tests/regressiontests/forms/localflavor/ca.py

@@ -37 +37 @@
 >>> f.clean('T2S 2H7')
 u'T2S 2H7'
 >>> f.clean('T2S2H7')
-Traceback (most recent call last):
-...
-ValidationError: [u'Enter a postal code in the format XXX XXX.']
+u'T2S 2H7'
 >>> f.clean('T2S 2H')
 Traceback (most recent call last):
 ...
@@ -60 +58 @@
 u''
 >>> f.clean('')
 u''
+>>> f.clean('t2s h8i')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXX XXX.']
+>>> f.clean('t2s 2h7')
+u'T2S 2H7'
+>>> f.clean('t2s2h7')
+u'T2S 2H7'
+>>> f.clean('t2s2H7')
+u'T2S 2H7'
+>>> f.clean('t2s            2H7')
+u'T2S 2H7'
+>>> f.clean('  t2s            2H7')
+u'T2S 2H7'
+>>> f.clean('  t2s 2H7  ')
+u'T2S 2H7'
+>>> f.clean('  T2S 2H7  ')
+u'T2S 2H7'
 
 # CAPhoneNumberField ##########################################################