Django

Code

Show
Ignore:
Timestamp:
10/05/08 00:59:04 (3 months ago)
Author:
mtredinnick
Message:

Fixed #9259 -- Fixed a validation error for Spanish identity card numbers.
Patch from Marc Garcia.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/localflavor/es/forms.py

    r8405 r9129  
    7777        self.cif_types = 'ABCDEFGHKLMNPQS' 
    7878        self.nie_types = 'XT' 
    79         super(ESIdentityCardNumberField, self).__init__(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types + self.cif_types.lower() + self.nie_types.lower(), self.nif_control + self.nif_control.lower()), 
    80                 max_length=None, min_length=None, 
     79        id_card_re = re.compile(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control + self.cif_control), re.IGNORECASE) 
     80        super(ESIdentityCardNumberField, self).__init__(id_card_re, max_length=None, min_length=None, 
    8181                error_message=self.default_error_messages['invalid%s' % (self.only_nif and '_only_nif' or '')], 
    8282                *args, **kwargs) 
    …… 
    8989 
    9090        value = value.upper().replace(' ', '').replace('-', '') 
    91         m = re.match(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control), value) 
     91        m = re.match(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control + self.cif_control), value) 
    9292        letter1, number, letter2 = m.groups() 
    9393