Changeset 5019

Timestamp:

04/17/07 10:57:16 (2 years ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [5018]

Files:

• django/branches/boulder-oracle-sprint/AUTHORS (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/contrib/databrowse/datastructures.py (modified) (4 diffs)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/it/forms.py (modified) (3 diffs)
• django/branches/boulder-oracle-sprint/django/contrib/localflavor/it/util.py (copied) (copied from django/trunk/django/contrib/localflavor/it/util.py)
• django/branches/boulder-oracle-sprint/django/db/backends/postgresql/base.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/tests/regressiontests/fixtures_regress/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py (modified) (2 diffs)

django/branches/boulder-oracle-sprint/AUTHORS

@@ -175 +175 @@
-    Michael Radziej <mir@noris.de>
-    ramiro
+    Massimiliano Ravelli <massimiliano.ravelli@gmail.com>
-    Brian Ray <http://brianray.chipy.org/>
-    remco@diji.biz

django/branches/boulder-oracle-sprint/django/contrib/databrowse/datastructures.py

@@ -4 +4 @@
-"""
-
-from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
-from django.db import models
-from django.utils import dateformat
-from django.utils.text import capfirst
-from django.utils.translation import get_date_formats
+
+EMPTY_VALUE = '(None)'
-
-class EasyModel(object):
@@ -133 +134 @@
-        so we can accomodate many-to-many fields.
-        """
+        # This import is deliberately inside the function because it causes
+        # some settings to be imported, and we don't want to do that at the
+        # module level.
-        if self.field.rel:
-            if isinstance(self.field.rel, models.ManyToOneRel):
@@ -139 +143 @@
-                return list(getattr(self.instance.instance, self.field.name).all())
-        elif self.field.choices:
-CHANGELIST_
+
-        elif isinstance(self.field, models.DateField) or isinstance(self.field, models.TimeField):
-            if self.raw_value:
@@ -150 +154 @@
-                    objs = capfirst(dateformat.format(self.raw_value, date_format))
-            else:
-CHANGELIST_
+
-        elif isinstance(self.field, models.BooleanField) or isinstance(self.field, models.NullBooleanField):
-            objs = {True: 'Yes', False: 'No', None: 'Unknown'}[self.raw_value]

django/branches/boulder-oracle-sprint/django/contrib/localflavor/it/forms.py

@@ -6 +6 @@
-from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
-from django.utils.translation import gettext
+from django.utils.encoding import smart_unicode
+from django.contrib.localflavor.it.util import ssn_check_digit, vat_number_check_digit
-import re
-
@@ -12 +14 @@
-        super(ITZipCodeField, self).__init__(r'^\d{5}$',
-        max_length=None, min_length=None,
-zip code in the format XXXXX
+valid zip code
-        *args, **kwargs)
-
@@ -30 +32 @@
-        from it_province import PROVINCE_CHOICES # relative import
-        super(ITProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
+
+class ITSocialSecurityNumberField(RegexField):
+    """
+    A form field that validates Italian Social Security numbers (codice fiscale).
+    For reference see http://www.agenziaentrate.it/ and search for
+    'Informazioni sulla codificazione delle persone fisiche'.
+    """
+    err_msg = gettext(u'Enter a valid Social Security number.')
+    def __init__(self, *args, **kwargs):
+        super(ITSocialSecurityNumberField, self).__init__(r'^\w{3}\s*\w{3}\s*\w{5}\s*\w{5}$',
+        max_length=None, min_length=None, error_message=self.err_msg,
+        *args, **kwargs)
+
+    def clean(self, value):
+        value = super(ITSocialSecurityNumberField, self).clean(value)
+        if value == u'':
+            return value
+        value = re.sub('\s', u'', value).upper()
+        try:
+            check_digit = ssn_check_digit(value)
+        except ValueError:
+            raise ValidationError(self.err_msg)
+        if not value[15] == check_digit:
+            raise ValidationError(self.err_msg)
+        return value
+
+class ITVatNumberField(Field):
+    """
+    A form field that validates Italian VAT numbers (partita IVA).
+    """
+    def clean(self, value):
+        value = super(ITVatNumberField, self).clean(value)
+        if value == u'':
+            return value
+        err_msg = gettext(u'Enter a valid VAT number.')
+        try:
+            vat_number = int(value)
+        except ValueError:
+            raise ValidationError(err_msg)
+        vat_number = str(vat_number).zfill(11)
+        check_digit = vat_number_check_digit(vat_number[0:10])
+        if not vat_number[10] == check_digit:
+            raise ValidationError(err_msg)
+        return smart_unicode(vat_number)

django/branches/boulder-oracle-sprint/django/db/backends/postgresql/base.py

@@ -211 +211 @@
-                    (style.SQL_KEYWORD('ALTER'),
-                    style.SQL_KEYWORD('SEQUENCE'),
-'%s_%s_seq' % (table_name, column_name
+quote_name('%s_%s_seq' % (table_name, column_name)
-                    style.SQL_KEYWORD('RESTART'),
-                    style.SQL_KEYWORD('WITH'),
@@ -222 +222 @@
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-'%s_id_seq' % table_name
+quote_name('%s_id_seq' % table_name)
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),

django/branches/boulder-oracle-sprint/django/db/backends/postgresql_psycopg2/base.py

@@ -168 +168 @@
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-'%s_%s_seq' % (table_name, column_name
+quote_name('%s_%s_seq' % (table_name, column_name)
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),
@@ -179 +179 @@
-                    (style.SQL_KEYWORD('ALTER'),
-                     style.SQL_KEYWORD('SEQUENCE'),
-'%s_id_seq' % table_name
+quote_name('%s_id_seq' % table_name)
-                     style.SQL_KEYWORD('RESTART'),
-                     style.SQL_KEYWORD('WITH'),

django/branches/boulder-oracle-sprint/tests/regressiontests/fixtures_regress/models.py

@@ -7 +7 @@
-    def __str__(self):
-        return self.common_name    
+
+class Plant(models.Model):
+    name = models.CharField(maxlength=150)
+
+    class Meta:
+        # For testing when upper case letter in app name; regression for #4057
+        db_table = "Fixtures_regress_plant"
-
-__test__ = {'API_TESTS':"""

django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py

@@ -634 +634 @@
-Traceback (most recent call last):
-...
-zip code in the format XXXXX
+valid zip code
-
-# ITRegionSelect #############################################################
@@ -642 +642 @@
->>> w.render('regions', 'PMN')
-u'<select name="regions">\n<option value="ABR">Abruzzo</option>\n<option value="BAS">Basilicata</option>\n<option value="CAL">Calabria</option>\n<option value="CAM">Campania</option>\n<option value="EMR">Emilia-Romagna</option>\n<option value="FVG">Friuli-Venezia Giulia</option>\n<option value="LAZ">Lazio</option>\n<option value="LIG">Liguria</option>\n<option value="LOM">Lombardia</option>\n<option value="MAR">Marche</option>\n<option value="MOL">Molise</option>\n<option value="PMN" selected="selected">Piemonte</option>\n<option value="PUG">Puglia</option>\n<option value="SAR">Sardegna</option>\n<option value="SIC">Sicilia</option>\n<option value="TOS">Toscana</option>\n<option value="TAA">Trentino-Alto Adige</option>\n<option value="UMB">Umbria</option>\n<option value="VAO">Valle d\u2019Aosta</option>\n<option value="VEN">Veneto</option>\n</select>'
+
+# ITSocialSecurityNumberField #################################################
+
+>>> from django.contrib.localflavor.it.forms import ITSocialSecurityNumberField
+>>> f = ITSocialSecurityNumberField()
+>>> f.clean('LVSGDU99T71H501L')
+u'LVSGDU99T71H501L'
+>>> f.clean('LBRRME11A01L736W')
+u'LBRRME11A01L736W'
+>>> f.clean('lbrrme11a01l736w')
+u'LBRRME11A01L736W'
+>>> f.clean('LBR RME 11A01 L736W')
+u'LBRRME11A01L736W'
+>>> f.clean('LBRRME11A01L736A')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Social Security number.']
+>>> f.clean('%BRRME11A01L736W')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid Social Security number.']
+
+# ITVatNumberField ###########################################################
+
+>>> from django.contrib.localflavor.it.forms import ITVatNumberField
+>>> f = ITVatNumberField()
+>>> f.clean('07973780013')
+u'07973780013'
+>>> f.clean('7973780013')
+u'07973780013'
+>>> f.clean(7973780013)
+u'07973780013'
+>>> f.clean('07973780014')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid VAT number.']
+>>> f.clean('A7973780013')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid VAT number.']
-
-# FIZipCodeField #############################################################