Ticket #10204: patch_nifniecif_es.diff

django/contrib/localflavor/es/forms.py

@@ -75 +75 @@
         self.nif_control = 'TRWAGMYFPDXBNJZSQVHLCKE'
         self.cif_control = 'JABCDEFGHI'
         self.cif_types = 'ABCDEFGHKLMNPQS'
-        self.nie_types = 'XT'
+        self.nie_types = 'XYZ'
         id_card_re = re.compile(r'^([%s]?)[ -]?(\d+)[ -]?([%s]?)$' % (self.cif_types + self.nie_types, self.nif_control + self.cif_control), re.IGNORECASE)
         super(ESIdentityCardNumberField, self).__init__(id_card_re, max_length=None, min_length=None,
                 error_message=self.default_error_messages['invalid%s' % (self.only_nif and '_only_nif' or '')],
@@ -99 +99 @@
                 raise ValidationError, self.error_messages['invalid_nif']
         elif letter1 in self.nie_types and letter2:
             # NIE
-            if letter2 == nif_get_checksum(number):
+            if letter2 == nif_get_checksum(str(self.nie_types.find(letter1)) + number):
                 return value
             else:
                 raise ValidationError, self.error_messages['invalid_nie']

tests/regressiontests/forms/localflavor/es.py

@@ -155 +155 @@
 'X0012953G'
 >>> f.clean('x-3287690-r')
 'X3287690R'
+>>> f.clean('y3287690r')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid checksum for NIE.']
+>>> f.clean('y3287690s')
+'Y3287690S'
 >>> f.clean('t-03287690r')
-'T03287690R'
+Traceback (most recent call last):
+...
+ValidationError: [u'Please enter a valid NIF, NIE, or CIF.']
 >>> f.clean('P2907500I')
 'P2907500I'
 >>> f.clean('X-03287690')
@@ -226 +234 @@
 >>> f.clean('x-3287690-r')
 'X3287690R'
 >>> f.clean('t-03287690r')
-'T03287690R'
+Traceback (most recent call last):
+...
+ValidationError: [u'Please enter a valid NIF, NIE, or CIF.']
 >>> f.clean('X-03287690')
 Traceback (most recent call last):
 ...