Ticket #11350: 11350.diff

tests/regressiontests/forms/localflavor/il.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+# Tests for the contrib/localflavor/ IL Form Fields
+
+tests = r"""
+# ILPostalCodeField #########################################################
+
+>>> from django.contrib.localflavor.il.forms import ILPostalCodeField
+>>> f = ILPostalCodeField()
+>>> f.clean('84545x')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX']
+>>> f.clean('69973')
+u'69973'
+>>> f.clean('699 73')
+u'69973'
+>>> f.clean('12345')
+u'12345'
+>>> f.clean('123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX']
+>>> f.clean('1234')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX']
+>>> f.clean('123 4')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format XXXXX']
+
+# ILIDNumberField ########################################################
+
+>>> from django.contrib.localflavor.il.forms import ILIDNumberField
+>>> f = ILIDNumberField()
+>>> f.clean('39337423')
+u'39337423'
+>>> f.clean('039337423')
+u'039337423'
+>>> f.clean('0091')
+u'0091'
+>>> f.clean('123465789')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid ID number.']
+>>> f.clean('012346578')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid ID number.']
+>>> f.clean('0001')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid ID number.']
+"""

django/contrib/localflavor/il/forms.py

@@ +1 @@
+"""
+Israeli-specific form helpers
+"""
+
+from django.forms import ValidationError
+from django.forms.fields import RegexField, Field
+from django.utils.translation import ugettext_lazy as _
+import re
+
+id_number = re.compile(r'^(?P<number>\d{1,8})(?P<check>\d)$')
+
+class ILPostalCodeField(RegexField):
+    """
+    A form field that validates its input as an Israeli postal code.
+    Valid form is XXXXX where X represents integer.
+    """
+    default_error_messages = {
+        'invalid': _(u'Enter a postal code in the format XXXXX'),
+    }
+
+    def __init__(self, *args, **kwargs):
+        super(ILPostalCodeField, self).__init__(r'^\d{5}$',
+            max_length=None, min_length=None, *args, **kwargs)
+
+    def clean(self, value):
+        """
+        Validates the input and returns a string that contains only numbers.
+        Returns an empty string for empty values.
+        """
+        return super(ILPostalCodeField, self).clean(value)
+
+class ILIDNumberField(Field):
+    """
+    A form field that validates its input as an Israeli identification number.
+    Valid form is per the Israeli ID specification.
+    """
+    default_error_messages = {
+        'invalid': _(u'Enter a valid ID number.'),
+    }
+
+    def clean(self, value):
+        super(ILIDNumberField, self).__init__(value)
+
+        if value in EMPTY_VALUES:
+            return u''
+
+        match = re.match(id_number, value)
+        if not match:
+            raise ValidationError(self.error_messages['invalid'])
+
+        number, check = match.groupdict()['number'].zfill(8), int(match.groupdict()['check'])
+
+        sum = 0
+        weight = 1
+        for digit in number+str(check):
+            sum += (lambda x: x/10 + x%10)(int(digit)*weight)
+            weight ^= 3
+                
+        if sum%10 != 0:
+            raise ValidationError(self.error_messages['invalid'])

docs/ref/contrib/localflavor.txt

@@ -52 +52 @@
     * India_
     * Indonesia_
     * Ireland_
+    * Israel_
     * Italy_
     * Japan_
     * Kuwait_
@@ -99 +100 @@
 .. _India: `India (in\_)`_
 .. _Indonesia: `Indonesia (id)`_
 .. _Ireland: `Ireland (ie)`_
+.. _Israel: `Israel (il)`_
 .. _Italy: `Italy (it)`_
 .. _Japan: `Japan (jp)`_
 .. _Kuwait: `Kuwait (kw)`_
@@ -419 +421 @@
 
 .. _NIK: http://en.wikipedia.org/wiki/Indonesian_identity_card
 
+Israel (``il``)
+==============
+
+.. class:: il.forms.ILPostalCodeField
+
+    A form field that validates its input as an Israeli postal code.
+    Valid form is XXXXX where X represents integer.
+
+.. class:: il.forms.ILIDNumberField
+
+    A form field that validates its input as an Israeli identification number.
+    Valid form is per the Israeli ID specification.
+
 Italy (``it``)
 ==============