Ticket #18102: Django-1.3.1_localflavor_forms.patch

django/contrib/localflavor/fr/forms.py

@@ -4 +4 @@
 
 from django.core.validators import EMPTY_VALUES
 from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
+from django.forms.fields import CharField, RegexField, Select
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 import re
@@ -18 +18 @@
 
     def __init__(self, *args, **kwargs):
         super(FRZipCodeField, self).__init__(r'^\d{5}$',
-            max_length=None, min_length=None, *args, **kwargs)
+            max_length=5, min_length=5, *args, **kwargs)
 
-class FRPhoneNumberField(Field):
+class FRPhoneNumberField(CharField):
     """
     Validate local French phone number (not international ones)
     The correct format is '0X XX XX XX XX'.
@@ -31 +31 @@
         'invalid': _('Phone numbers must be in 0X XX XX XX XX format.'),
     }
 
+    def __init__(self, *args, **kwargs):
+        super(FRPhoneNumberField, self).__init__(
+            max_length=14, min_length=10, *args, **kwargs)
+
     def clean(self, value):
         super(FRPhoneNumberField, self).clean(value)
         if value in EMPTY_VALUES:
@@ -48 +52 @@
     def __init__(self, attrs=None):
         from fr_department import DEPARTMENT_ASCII_CHOICES
         super(FRDepartmentSelect, self).__init__(attrs, choices=DEPARTMENT_ASCII_CHOICES)
-