From f4860448ddad760172b4dde0323140e99d78a55f Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Tue, 3 May 2011 11:52:20 +0000
Subject: 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
---
 tests/regressiontests/forms/localflavor/gb.py   | 30 +++++++++++++++++++++++++
 tests/regressiontests/forms/localflavor/uk.py   | 30 -------------------------
 tests/regressiontests/forms/localflavortests.py |  2 +-
 tests/regressiontests/forms/tests/__init__.py   |  2 +-
 4 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 tests/regressiontests/forms/localflavor/gb.py
 delete mode 100644 tests/regressiontests/forms/localflavor/uk.py

(limited to 'tests/regressiontests/forms')

diff --git a/tests/regressiontests/forms/localflavor/gb.py b/tests/regressiontests/forms/localflavor/gb.py
new file mode 100644
index 0000000000..7f23ba58c9
--- /dev/null
+++ b/tests/regressiontests/forms/localflavor/gb.py
@@ -0,0 +1,30 @@
+from django.contrib.localflavor.gb.forms import GBPostcodeField
+
+from utils import LocalFlavorTestCase
+
+
+class GBLocalFlavorTests(LocalFlavorTestCase):
+    def test_GBPostcodeField(self):
+        error_invalid = [u'Enter a valid postcode.']
+        valid = {
+            'BT32 4PX': 'BT32 4PX',
+            'GIR 0AA': 'GIR 0AA',
+            'BT324PX': 'BT32 4PX',
+            ' so11aa ': 'SO1 1AA',
+            ' so1  1aa ': 'SO1 1AA',
+            'G2 3wt': 'G2 3WT',
+            'EC1A 1BB': 'EC1A 1BB',
+            'Ec1a1BB': 'EC1A 1BB',
+        }
+        invalid = {
+            '1NV 4L1D': error_invalid,
+            '1NV4L1D': error_invalid,
+            ' b0gUS': error_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(GBPostcodeField, valid, invalid, field_kwargs=kwargs)
diff --git a/tests/regressiontests/forms/localflavor/uk.py b/tests/regressiontests/forms/localflavor/uk.py
deleted file mode 100644
index 6fd536f936..0000000000
--- a/tests/regressiontests/forms/localflavor/uk.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from django.contrib.localflavor.uk.forms import UKPostcodeField
-
-from utils import LocalFlavorTestCase
-
-
-class UKLocalFlavorTests(LocalFlavorTestCase):
-    def test_UKPostcodeField(self):
-        error_invalid = [u'Enter a valid postcode.']
-        valid = {
-            'BT32 4PX': 'BT32 4PX',
-            'GIR 0AA': 'GIR 0AA',
-            'BT324PX': 'BT32 4PX',
-            ' so11aa ': 'SO1 1AA',
-            ' so1  1aa ': 'SO1 1AA',
-            'G2 3wt': 'G2 3WT',
-            'EC1A 1BB': 'EC1A 1BB',
-            'Ec1a1BB': 'EC1A 1BB',
-        }
-        invalid = {
-            '1NV 4L1D': error_invalid,
-            '1NV4L1D': error_invalid,
-            ' b0gUS': error_invalid,
-        }
-        self.assertFieldOutput(UKPostcodeField, 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)
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
-- 
cgit v1.3