Fixed #13729 -- Renamed UK localflavor to GB to correctly follow ISO 3166. Thanks, Claude Paroz.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16147 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 7 insertions, 7 deletions

diff --git a/tests/regressiontests/forms/localflavor/uk.py b/tests/regressiontests/forms/localflavor/gb.py
index 6fd536f936..7f23ba58c9 100644
--- a/tests/regressiontests/forms/localflavor/uk.py
+++ b/tests/regressiontests/forms/localflavor/gb.py
@@ -1,10 +1,10 @@
-from django.contrib.localflavor.uk.forms import UKPostcodeField
+from django.contrib.localflavor.gb.forms import GBPostcodeField
 
 from utils import LocalFlavorTestCase
 
 
-class UKLocalFlavorTests(LocalFlavorTestCase):
-    def test_UKPostcodeField(self):
+class GBLocalFlavorTests(LocalFlavorTestCase):
+    def test_GBPostcodeField(self):
         error_invalid = [u'Enter a valid postcode.']
         valid = {
             'BT32 4PX': 'BT32 4PX',
@@ -21,10 +21,10 @@ class UKLocalFlavorTests(LocalFlavorTestCase):
             '1NV4L1D': error_invalid,
             ' b0gUS': error_invalid,
         }
-        self.assertFieldOutput(UKPostcodeField, valid, invalid)
+        self.assertFieldOutput(GBPostcodeField, valid, invalid)
         valid = {}
         invalid = {
             '1NV 4L1D': [u'Enter a bloody postcode!'],
         }
         kwargs = {'error_messages': {'invalid': 'Enter a bloody postcode!'}}
-        self.assertFieldOutput(UKPostcodeField, valid, invalid, field_kwargs=kwargs)
+        self.assertFieldOutput(GBPostcodeField, valid, invalid, field_kwargs=kwargs)
diff --git a/tests/regressiontests/forms/localflavortests.py b/tests/regressiontests/forms/localflavortests.py
index 73f46a7201..fb501ab9d4 100644
--- a/tests/regressiontests/forms/localflavortests.py
+++ b/tests/regressiontests/forms/localflavortests.py
@@ -12,6 +12,7 @@ from localflavor.de import DELocalFlavorTests
 from localflavor.es import ESLocalFlavorTests
 from localflavor.fi import FILocalFlavorTests
 from localflavor.fr import FRLocalFlavorTests
+from localflavor.gb import GBLocalFlavorTests
 from localflavor.generic import GenericLocalFlavorTests
 from localflavor.hr import HRLocalFlavorTests
 from localflavor.id import IDLocalFlavorTests
@@ -29,7 +30,6 @@ from localflavor.ru import RULocalFlavorTests
 from localflavor.se import SELocalFlavorTests
 from localflavor.sk import SKLocalFlavorTests
 from localflavor.tr import TRLocalFlavorTests
-from localflavor.uk import UKLocalFlavorTests
 from localflavor.us import USLocalFlavorTests
 from localflavor.uy import UYLocalFlavorTests
 from localflavor.za import ZALocalFlavorTests
diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py
index 2d8f9e9efe..6366a934cb 100644
--- a/tests/regressiontests/forms/tests/__init__.py
+++ b/tests/regressiontests/forms/tests/__init__.py
@@ -26,6 +26,7 @@ from regressiontests.forms.localflavortests import (
     ESLocalFlavorTests,
     FILocalFlavorTests,
     FRLocalFlavorTests,
+    GBLocalFlavorTests,
     GenericLocalFlavorTests,
     HRLocalFlavorTests,
     IDLocalFlavorTests,
@@ -43,7 +44,6 @@ from regressiontests.forms.localflavortests import (
     SELocalFlavorTests,
     SKLocalFlavorTests,
     TRLocalFlavorTests,
-    UKLocalFlavorTests,
     USLocalFlavorTests,
     UYLocalFlavorTests,
     ZALocalFlavorTests