Fixed #12595 -- Fixed bad arguments handling in localflavor form fields.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · May 3, 2011 · 41a1a89 · 41a1a89
1 parent 48cffd9
commit 41a1a89
Show file tree

Hide file tree

Showing 28 changed files with 111 additions and 104 deletions.
diff --git a/django/contrib/localflavor/ar/forms.py b/django/contrib/localflavor/ar/forms.py
@@ -28,9 +28,9 @@ class ARPostalCodeField(RegexField):
         'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=8, min_length=4, *args, **kwargs):
         super(ARPostalCodeField, self).__init__(r'^\d{4}$|^[A-HJ-NP-Za-hj-np-z]\d{4}\D{3}$',
-            min_length=4, max_length=8, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         value = super(ARPostalCodeField, self).clean(value)
@@ -51,8 +51,8 @@ class ARDNIField(CharField):
         'max_digits': _("This field requires 7 or 8 digits."),
     }
 
-    def __init__(self, *args, **kwargs):
-        super(ARDNIField, self).__init__(max_length=10, min_length=7, *args,
+    def __init__(self, max_length=10, min_length=7, *args, **kwargs):
+        super(ARDNIField, self).__init__(max_length, min_length, *args,
                 **kwargs)
 
     def clean(self, value):
@@ -81,9 +81,9 @@ class ARCUITField(RegexField):
         'checksum': _("Invalid CUIT."),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$',
-            *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         """

diff --git a/django/contrib/localflavor/at/forms.py b/django/contrib/localflavor/at/forms.py
@@ -21,9 +21,9 @@ class ATZipCodeField(RegexField):
     default_error_messages = {
         'invalid': _('Enter a zip code in the format XXXX.'),
     }
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ATZipCodeField, self).__init__(r'^\d{4}$',
-                max_length=None, min_length=None, *args, **kwargs)
+                max_length, min_length, *args, **kwargs)
 
 class ATStateSelect(Select):
     """

diff --git a/django/contrib/localflavor/au/forms.py b/django/contrib/localflavor/au/forms.py
@@ -21,11 +21,9 @@ class AUPostCodeField(RegexField):
         'invalid': _('Enter a 4 digit postcode.'),
     }
 
-    def __init__(self, *args, **kwargs):
-        if 'max_length' in kwargs:
-            kwargs.pop('max_length')
+    def __init__(self, max_length=4, min_length=None, *args, **kwargs):
         super(AUPostCodeField, self).__init__(r'^\d{4}$',
-            max_length=4, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 
 class AUPhoneNumberField(Field):

diff --git a/django/contrib/localflavor/be/forms.py b/django/contrib/localflavor/be/forms.py
@@ -23,9 +23,9 @@ class BEPostalCodeField(RegexField):
             'Enter a valid postal code in the range and format 1XXX - 9XXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(BEPostalCodeField, self).__init__(r'^[1-9]\d{3}$',
-                max_length=None, min_length=None, *args, **kwargs)
+                max_length, min_length, *args, **kwargs)
 
 class BEPhoneNumberField(RegexField):
     """
@@ -50,9 +50,9 @@ class BEPhoneNumberField(RegexField):
                      '0xxxxxxxx or 04xxxxxxxx.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(BEPhoneNumberField, self).__init__(r'^[0]\d{1}[/. ]?\d{3}[. ]\d{2}[. ]?\d{2}$|^[0]\d{2}[/. ]?\d{2}[. ]?\d{2}[. ]?\d{2}$|^[0][4]\d{2}[/. ]?\d{2}[. ]?\d{2}[. ]?\d{2}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class BERegionSelect(Select):
     """

diff --git a/django/contrib/localflavor/br/forms.py b/django/contrib/localflavor/br/forms.py
@@ -17,9 +17,9 @@ class BRZipCodeField(RegexField):
         'invalid': _('Enter a zip code in the format XXXXX-XXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(BRZipCodeField, self).__init__(r'^\d{5}-\d{3}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class BRPhoneNumberField(Field):
     default_error_messages = {
@@ -92,8 +92,8 @@ class BRCPFField(CharField):
         'digits_only': _("This field requires only numbers."),
     }
 
-    def __init__(self, *args, **kwargs):
-        super(BRCPFField, self).__init__(max_length=14, min_length=11, *args, **kwargs)
+    def __init__(self, max_length=14, min_length=11, *args, **kwargs):
+        super(BRCPFField, self).__init__(max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         """

diff --git a/django/contrib/localflavor/ca/forms.py b/django/contrib/localflavor/ca/forms.py
@@ -25,9 +25,9 @@ class CAPostalCodeField(RegexField):
         'invalid': _(u'Enter a postal code in the format XXX XXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(CAPostalCodeField, self).__init__(r'^[ABCEGHJKLMNPRSTVXY]\d[ABCEGHJKLMNPRSTVWXYZ] \d[ABCEGHJKLMNPRSTVWXYZ]\d$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class CAPhoneNumberField(Field):
     """Canadian phone number field."""

diff --git a/django/contrib/localflavor/ch/forms.py b/django/contrib/localflavor/ch/forms.py
@@ -17,9 +17,9 @@ class CHZipCodeField(RegexField):
         'invalid': _('Enter a zip code in the format XXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(CHZipCodeField, self).__init__(r'^\d{4}$',
-        max_length=None, min_length=None, *args, **kwargs)
+        max_length, min_length, *args, **kwargs)
 
 class CHPhoneNumberField(Field):
     """

diff --git a/django/contrib/localflavor/cz/forms.py b/django/contrib/localflavor/cz/forms.py
@@ -28,9 +28,9 @@ class CZPostalCodeField(RegexField):
         'invalid': _(u'Enter a postal code in the format XXXXX or XXX XX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(CZPostalCodeField, self).__init__(r'^\d{5}$|^\d{3} \d{2}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         """

diff --git a/django/contrib/localflavor/de/forms.py b/django/contrib/localflavor/de/forms.py
@@ -14,9 +14,9 @@ class DEZipCodeField(RegexField):
     default_error_messages = {
         'invalid': _('Enter a zip code in the format XXXXX.'),
     }
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(DEZipCodeField, self).__init__(r'^\d{5}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class DEStateSelect(Select):
     """

diff --git a/django/contrib/localflavor/es/forms.py b/django/contrib/localflavor/es/forms.py
@@ -20,10 +20,10 @@ class ESPostalCodeField(RegexField):
         'invalid': _('Enter a valid postal code in the range and format 01XXX - 52XXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ESPostalCodeField, self).__init__(
                 r'^(0[1-9]|[1-4][0-9]|5[0-2])\d{3}$',
-                max_length=None, min_length=None, *args, **kwargs)
+                max_length, min_length, *args, **kwargs)
 
 class ESPhoneNumberField(RegexField):
     """
@@ -40,9 +40,9 @@ class ESPhoneNumberField(RegexField):
         'invalid': _('Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ESPhoneNumberField, self).__init__(r'^(6|7|8|9)\d{8}$',
-                max_length=None, min_length=None, *args, **kwargs)
+                max_length, min_length, *args, **kwargs)
 
 class ESIdentityCardNumberField(RegexField):
     """
@@ -71,14 +71,14 @@ class ESIdentityCardNumberField(RegexField):
         'invalid_cif': _('Invalid checksum for CIF.'),
     }
 
-    def __init__(self, only_nif=False, *args, **kwargs):
+    def __init__(self, only_nif=False, max_length=None, min_length=None, *args, **kwargs):
         self.only_nif = only_nif
         self.nif_control = 'TRWAGMYFPDXBNJZSQVHLCKE'
         self.cif_control = 'JABCDEFGHI'
         self.cif_types = 'ABCDEFGHKLMNPQS'
         self.nie_types = 'XT'
         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,
+        super(ESIdentityCardNumberField, self).__init__(id_card_re, max_length, min_length,
                 error_message=self.default_error_messages['invalid%s' % (self.only_nif and '_only_nif' or '')],
                 *args, **kwargs)
 
@@ -144,9 +144,9 @@ class ESCCCField(RegexField):
         'checksum': _('Invalid checksum for bank account number.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ESCCCField, self).__init__(r'^\d{4}[ -]?\d{4}[ -]?\d{2}[ -]?\d{10}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         super(ESCCCField, self).clean(value)

diff --git a/django/contrib/localflavor/fi/forms.py b/django/contrib/localflavor/fi/forms.py
@@ -12,9 +12,9 @@ class FIZipCodeField(RegexField):
     default_error_messages = {
         'invalid': _('Enter a zip code in the format XXXXX.'),
     }
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(FIZipCodeField, self).__init__(r'^\d{5}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class FIMunicipalitySelect(Select):
     """

diff --git a/django/contrib/localflavor/fr/forms.py b/django/contrib/localflavor/fr/forms.py
@@ -16,9 +16,9 @@ class FRZipCodeField(RegexField):
         'invalid': _('Enter a zip code in the format XXXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(FRZipCodeField, self).__init__(r'^\d{5}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class FRPhoneNumberField(Field):
     """

diff --git a/django/contrib/localflavor/hr/forms.py b/django/contrib/localflavor/hr/forms.py
@@ -120,9 +120,9 @@ class HROIBField(RegexField):
         'invalid': _('Enter a valid 11 digit OIB'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, min_length=11, max_length=11, *args, **kwargs):
         super(HROIBField, self).__init__(r'^\d{11}$',
-            min_length=11, max_length=11, *args, **kwargs)
+            min_length, max_length, *args, **kwargs)
 
     def clean(self, value):
         super(HROIBField, self).clean(value)

diff --git a/django/contrib/localflavor/in_/forms.py b/django/contrib/localflavor/in_/forms.py
@@ -15,9 +15,9 @@ class INZipCodeField(RegexField):
         'invalid': gettext(u'Enter a zip code in the format XXXXXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(INZipCodeField, self).__init__(r'^\d{6}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class INStateField(Field):
     """

diff --git a/django/contrib/localflavor/is_/forms.py b/django/contrib/localflavor/is_/forms.py
@@ -19,9 +19,9 @@ class ISIdNumberField(RegexField):
         'checksum': _(u'The Icelandic identification number is not valid.'),
     }
 
-    def __init__(self, *args, **kwargs):
-        kwargs['min_length'],kwargs['max_length'] = 10,11
-        super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$', *args, **kwargs)
+    def __init__(self, max_length=11, min_length=10, *args, **kwargs):
+        super(ISIdNumberField, self).__init__(r'^\d{6}(-| )?\d{4}$',
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         value = super(ISIdNumberField, self).clean(value)
@@ -61,9 +61,9 @@ class ISPhoneNumberField(RegexField):
     Icelandic phone number. Seven digits with an optional hyphen or space after
     the first three digits.
     """
-    def __init__(self, *args, **kwargs):
-        kwargs['min_length'], kwargs['max_length'] = 7,8
-        super(ISPhoneNumberField, self).__init__(r'^\d{3}(-| )?\d{4}$', *args, **kwargs)
+    def __init__(self, max_length=8, min_length=7, *args, **kwargs):
+        super(ISPhoneNumberField, self).__init__(r'^\d{3}(-| )?\d{4}$',
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         value = super(ISPhoneNumberField, self).clean(value)

diff --git a/django/contrib/localflavor/it/forms.py b/django/contrib/localflavor/it/forms.py
@@ -14,9 +14,9 @@ class ITZipCodeField(RegexField):
     default_error_messages = {
         'invalid': _('Enter a valid zip code.'),
     }
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ITZipCodeField, self).__init__(r'^\d{5}$',
-        max_length=None, min_length=None, *args, **kwargs)
+              max_length, min_length, *args, **kwargs)
 
 class ITRegionSelect(Select):
     """
@@ -44,9 +44,9 @@ class ITSocialSecurityNumberField(RegexField):
         'invalid': _(u'Enter a valid Social Security number.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(ITSocialSecurityNumberField, self).__init__(r'^\w{3}\s*\w{3}\s*\w{5}\s*\w{5}$',
-        max_length=None, min_length=None, *args, **kwargs)
+              max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         value = super(ITSocialSecurityNumberField, self).clean(value)

diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py
@@ -16,9 +16,9 @@ class JPPostalCodeField(RegexField):
         'invalid': _('Enter a postal code in the format XXXXXXX or XXX-XXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(JPPostalCodeField, self).__init__(r'^\d{3}-\d{4}$|^\d{7}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
     def clean(self, value):
         """

diff --git a/django/contrib/localflavor/no/forms.py b/django/contrib/localflavor/no/forms.py
@@ -13,9 +13,9 @@ class NOZipCodeField(RegexField):
         'invalid': _('Enter a zip code in the format XXXX.'),
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
         super(NOZipCodeField, self).__init__(r'^\d{4}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length, min_length, *args, **kwargs)
 
 class NOMunicipalitySelect(Select):
     """

diff --git a/django/contrib/localflavor/pe/forms.py b/django/contrib/localflavor/pe/forms.py
@@ -25,8 +25,8 @@ class PEDNIField(CharField):
         'max_digits': _("This field requires 8 digits."),
     }
 
-    def __init__(self, *args, **kwargs):
-        super(PEDNIField, self).__init__(max_length=8, min_length=8, *args,
+    def __init__(self, max_length=8, min_length=8, *args, **kwargs):
+        super(PEDNIField, self).__init__(max_length, min_length, *args,
                 **kwargs)
 
     def clean(self, value):
@@ -53,8 +53,8 @@ class PERUCField(RegexField):
         'max_digits': _("This field requires 11 digits."),
     }
 
-    def __init__(self, *args, **kwargs):
-        super(PERUCField, self).__init__(max_length=11, min_length=11, *args,
+    def __init__(self, max_length=11, min_length=11, *args, **kwargs):
+        super(PERUCField, self).__init__(max_length, min_length, *args,
             **kwargs)
 
     def clean(self, value):