From d1e7fdea3fe3e4dd28301151ef4e83fe2a2d0a1c Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Sun, 17 Jan 2010 22:51:25 +0000
Subject: [PATCH] [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        | 2 +-
 tests/regressiontests/forms/localflavor/uk.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py
index 7df736444a..aafe9734db 100644
--- a/django/contrib/localflavor/uk/forms.py
+++ b/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):
diff --git a/tests/regressiontests/forms/localflavor/uk.py b/tests/regressiontests/forms/localflavor/uk.py
index 258c22e5a9..d041e8f179 100644
--- a/tests/regressiontests/forms/localflavor/uk.py
+++ b/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!']
 """