Ticket #10204: patch_and_tests_final.diff

django/contrib/localflavor/es/forms.py

@@ -75 +75 @@
-        self.nif_control = 'TRWAGMYFPDXBNJZSQVHLCKE'
-        self.cif_control = 'JABCDEFGHI'
-        self.cif_types = 'ABCDEFGHKLMNPQS'
-
+YZ
-        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 '')],

tests/regressiontests/forms/localflavor/es.py

@@ -155 +155 @@
-'X0012953G'
->>> f.clean('x-3287690-r')
-'X3287690R'
+>>> f.clean('Y-3287690-R')
+'Y3287690R'
+>>> f.clean('y-3287690-r')
+'Y3287690R'
+>>> f.clean('Y 3287690 R')
+'Y3287690R'
+>>> f.clean('Y-3287690-T')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid checksum for NIE.']
+>>> f.clean('Y-03287690')
+Traceback (most recent call last):
+...
+ValidationError: [u'Please enter a valid NIF, NIE, or CIF.']
+>>> f.clean('Z-3287690-R')
+'Z3287690R'
+>>> f.clean('Z-3287690-T')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid checksum for NIE.']
+>>> f.clean('Z-03287690')
+Traceback (most recent call last):
+...
+ValidationError: [u'Please enter a valid NIF, NIE, or CIF.']
->>> f.clean('t-03287690r')
-'T03287690R'
->>> f.clean('P2907500I')

AUTHORS

@@ -444 +444 @@
-    Mykola Zamkovoi <nickzam@gmail.com>
-    Jarek Zgoda <jarek.zgoda@gmail.com>
-    Cheng Zhang
+    Pablo Suárez Hernández <meaksh@gmail.com>
-
-A big THANK YOU goes to:
-