[1.1.X] Fixed #12017 - Overriding the default error message of the UKPostcodeField works again. Backport of r12044 and r12249.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12250 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/localflavor/uk/forms.py

@@ -33,7 +33,7 @@ class UKPostcodeField(CharField):
         # Put a single space before the incode (second part).
         postcode = self.space_regex.sub(r' \1', postcode)
         if not self.postcode_regex.search(postcode):
-            raise ValidationError(self.default_error_messages['invalid'])
+            raise ValidationError(self.error_messages['invalid'])
         return postcode
 
 class UKCountySelect(Select):

tests/regressiontests/forms/localflavor/uk.py

@@ -58,4 +58,9 @@ u'BT32 4PX'
 u''
 >>> f.clean('')
 u''
+>>> f = UKPostcodeField(error_messages={'invalid': 'Enter a bloody postcode!'})
+>>> f.clean('1NV 4L1D')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a bloody postcode!']
 """