From 1d5e974a4f2e116a1530c24e6df54449b8ef3c98 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 15 Feb 2007 21:26:43 +0000 Subject: [PATCH] Fixed #3503 -- Added newforms UKPostcodeField in django.contrib.localflavor.uk. Thanks for the patch, Jonathan Buchanan git-svn-id: http://code.djangoproject.com/svn/django/trunk@4527 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/localflavor/uk/__init__.py | 0 django/contrib/localflavor/uk/forms.py | 19 ++++++++++ tests/regressiontests/forms/tests.py | 44 +++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 django/contrib/localflavor/uk/__init__.py create mode 100644 django/contrib/localflavor/uk/forms.py diff --git a/django/contrib/localflavor/uk/__init__.py b/django/contrib/localflavor/uk/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/contrib/localflavor/uk/forms.py b/django/contrib/localflavor/uk/forms.py new file mode 100644 index 0000000000..ddd033e1e0 --- /dev/null +++ b/django/contrib/localflavor/uk/forms.py @@ -0,0 +1,19 @@ +""" +UK-specific Form helpers +""" + +from django.newforms.fields import RegexField +from django.utils.translation import gettext + +class UKPostcodeField(RegexField): + """ + A form field that validates its input is a UK postcode. + + The regular expression used is sourced from the schema for British Standard + BS7666 address types: http://www.govtalk.gov.uk/gdsc/schemas/bs7666-v2-0.xsd + """ + def __init__(self, *args, **kwargs): + super(UKPostcodeField, self).__init__(r'^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HIK-Y][0-9](|[0-9]|[ABEHMNPRVWXY]))|[0-9][A-HJKSTUW]) [0-9][ABD-HJLNP-UW-Z]{2})$', + max_length=None, min_length=None, + error_message=gettext(u'Enter a postcode. A space is required between the two postcode parts.'), + *args, **kwargs) diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py index 63cb2f927e..5bd56109a1 100644 --- a/tests/regressiontests/forms/tests.py +++ b/tests/regressiontests/forms/tests.py @@ -3327,6 +3327,50 @@ u'' >>> f.clean('') u'' +# UKPostcodeField ############################################################## + +UKPostcodeField validates that the data is a valid UK postcode. +>>> from django.contrib.localflavor.uk.forms import UKPostcodeField +>>> f = UKPostcodeField() +>>> f.clean('BT32 4PX') +u'BT32 4PX' +>>> f.clean('GIR 0AA') +u'GIR 0AA' +>>> f.clean('BT324PX') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean('1NV 4L1D') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean(None) +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] +>>> f.clean('') +Traceback (most recent call last): +... +ValidationError: [u'This field is required.'] + +>>> f = UKPostcodeField(required=False) +>>> f.clean('BT32 4PX') +u'BT32 4PX' +>>> f.clean('GIR 0AA') +u'GIR 0AA' +>>> f.clean('1NV 4L1D') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean('BT324PX') +Traceback (most recent call last): +... +ValidationError: [u'Enter a postcode. A space is required between the two postcode parts.'] +>>> f.clean(None) +u'' +>>> f.clean('') +u'' + ################################# # Tests of underlying functions # #################################