Ticket #8229: 8229.diff

django/contrib/localflavor/es/forms.py

@@ -56 +56 @@
     according to a couple of simple checksum algorithms.
 
     Value can include a space or hyphen separator between number and letters.
-    Number length is not checked for NIF (or NIE), old values start with a 1,
+    Number length is not checked for NIF (or NIE), old values start by 1,
     and future values can contain digits greater than 8. The CIF control digit
     can be a number or a letter depending on company type. Algorithm is not
     public, and different authors have different opinions on which ones allows
@@ -108 +108 @@
             if not letter2:
                 number, letter2 = number[:-1], int(number[-1])
             checksum = cif_get_checksum(number)
-            if letter2 in [checksum, self.cif_control[checksum]]:
+            if letter2 in (checksum, self.cif_control[checksum]):
                 return value
             else:
                 raise ValidationError, self.error_messages['invalid_cif']
@@ -180 +180 @@
 def cif_get_checksum(number):
     s1 = sum([int(digit) for pos, digit in enumerate(number) if int(pos) % 2])
     s2 = sum([sum([int(unit) for unit in str(int(digit) * 2)]) for pos, digit in enumerate(number) if not int(pos) % 2])
-    return 10 - ((s1 + s2) % 10)
+    return (10 - ((s1 + s2) % 10)) % 10
 

tests/regressiontests/forms/localflavor/es.py

@@ -167 +167 @@
 ValidationError: [u'Invalid checksum for NIE.']
 >>> f.clean('B38790911')
 'B38790911'
+>>> f.clean('B31234560')
+'B31234560'
 >>> f.clean('B-3879091A')
 'B3879091A'
 >>> f.clean('B 38790917')