From af6ed6c91ded72d7b35f7120f3581fd8100d308b Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 26 Apr 2007 14:55:18 +0000 Subject: [PATCH] Small formatting changes to localflavor/is_/forms.py git-svn-id: http://code.djangoproject.com/svn/django/trunk@5095 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/localflavor/is_/forms.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/django/contrib/localflavor/is_/forms.py b/django/contrib/localflavor/is_/forms.py index 3ee2d76937..d052acf579 100644 --- a/django/contrib/localflavor/is_/forms.py +++ b/django/contrib/localflavor/is_/forms.py @@ -1,12 +1,12 @@ """ Iceland specific form helpers. """ + from django.newforms import ValidationError from django.newforms.fields import RegexField, EMPTY_VALUES from django.newforms.widgets import Select from django.utils.translation import gettext - class ISIdNumberField(RegexField): """ Icelandic identification number (kennitala). This is a number every citizen @@ -15,7 +15,6 @@ class ISIdNumberField(RegexField): def __init__(self, *args, **kwargs): error_msg = gettext(u'Enter a valid Icelandic identification number. The format is XXXXXX-XXXX.') kwargs['min_length'],kwargs['max_length'] = 10,11 - super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$', error_message=error_msg, *args, **kwargs) def clean(self, value): @@ -30,7 +29,6 @@ class ISIdNumberField(RegexField): else: raise ValidationError(gettext(u'The Icelandic identification number is not valid.')) - def _canonify(self, value): """ Returns the value as only digits. @@ -52,7 +50,6 @@ class ISIdNumberField(RegexField): """ return value[:6]+'-'+value[6:] - class ISPhoneNumberField(RegexField): """ Icelandic phone number. Seven digits with an optional hyphen or space after @@ -70,7 +67,6 @@ class ISPhoneNumberField(RegexField): return value.replace('-', '').replace(' ', '') - class ISPostalCodeSelect(Select): """ A Select widget that uses a list of Icelandic postal codes as its choices.