Author: mtredinnick
Date: 2007-09-13 19:58:57 -0500 (Thu, 13 Sep 2007)
New Revision: 6145
Added:
django/trunk/django/contrib/localflavor/ar/
django/trunk/django/contrib/localflavor/ar/__init__.py
django/trunk/django/contrib/localflavor/ar/ar_provinces.py
django/trunk/django/contrib/localflavor/ar/forms.py
Modified:
django/trunk/tests/regressiontests/forms/localflavor.py
Log:
Fixed #5431 -- Added Argentinean localflavor. Thanks, Ramiro Morales.
Added: django/trunk/django/contrib/localflavor/ar/__init__.py
===================================================================
Added: django/trunk/django/contrib/localflavor/ar/ar_provinces.py
===================================================================
--- django/trunk/django/contrib/localflavor/ar/ar_provinces.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/ar/ar_provinces.py 2007-09-14
00:58:57 UTC (rev 6145)
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+"""
+A list of Argentinean provinces and autonomous cities as `choices` in a
+formfield. From
+http://www.argentina.gov.ar/argentina/portal/paginas.dhtml?pagina=425
+
+This exists in this standalone file so that it's only imported into memory
+when explicitly needed.
+"""
+
+PROVINCE_CHOICES = (
+ ('B', u'Buenos Aires'),
+ ('K', u'Catamarca'),
+ ('H', u'Chaco'),
+ ('U', u'Chubut'),
+ ('C', u'Ciudad Autónoma de Buenos Aires'),
+ ('X', u'Córdoba'),
+ ('W', u'Corrientes'),
+ ('E', u'Entre Ríos'),
+ ('P', u'Formosa'),
+ ('Y', u'Jujuy'),
+ ('L', u'La Pampa'),
+ ('F', u'La Rioja'),
+ ('M', u'Mendoza'),
+ ('N', u'Misiones'),
+ ('Q', u'Neuquén'),
+ ('R', u'Río Negro'),
+ ('A', u'Salta'),
+ ('J', u'San Juan'),
+ ('D', u'San Luis'),
+ ('Z', u'Santa Cruz'),
+ ('S', u'Santa Fe'),
+ ('G', u'Santiago del Estero'),
+ ('V', u'Tierra del Fuego, Antártida e Islas del Atlántico Sur'),
+ ('T', u'Tucumán'),
+)
Added: django/trunk/django/contrib/localflavor/ar/forms.py
===================================================================
--- django/trunk/django/contrib/localflavor/ar/forms.py
(rev 0)
+++ django/trunk/django/contrib/localflavor/ar/forms.py 2007-09-14 00:58:57 UTC
(rev 6145)
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+"""
+AR-specific Form helpers.
+"""
+
+from django.newforms import ValidationError
+from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES
+from django.utils.encoding import smart_unicode
+from django.utils.translation import ugettext
+import re
+
+class ARProvinceSelect(Select):
+ """
+ A Select widget that uses a list of Argentinean provinces/autonomous cities
+ as its choices.
+ """
+ def __init__(self, attrs=None):
+ from ar_provinces import PROVINCE_CHOICES
+ super(ARProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)
+
+class ARPostalCodeField(RegexField):
+ """
+ A field that accepts a `classic� NNNN Postal Code or a CPA.
+
+ See http://www.correoargentino.com.ar/consulta_cpa/home.php
+ """
+ def __init__(self, *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,
+ error_message=ugettext("Enter a postal code in the format NNNN or
ANNNNAAA."),
+ *args, **kwargs)
+
+ def clean(self, value):
+ value = super(ARPostalCodeField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ if len(value) not in (4, 8):
+ raise ValidationError(ugettext("Enter a postal code in the format
NNNN or ANNNNAAA."))
+ if len(value) == 8:
+ return u'%s%s%s' % (value[0].upper(), value[1:5],
value[5:].upper())
+ return value
+
+class ARDNIField(CharField):
+ """
+ A field that validates `Documento Nacional de Identidad� (DNI) numbers.
+ """
+ def __init__(self, *args, **kwargs):
+ super(ARDNIField, self).__init__(max_length=10, min_length=7, *args,
+ **kwargs)
+
+ def clean(self, value):
+ """
+ Value can be a string either in the [X]X.XXX.XXX or [X]XXXXXXX formats.
+ """
+ value = super(ARDNIField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ if not value.isdigit():
+ value = value.replace('.', '')
+ if not value.isdigit():
+ raise ValidationError(ugettext("This field requires only
numbers."))
+ if len(value) not in (7, 8):
+ raise ValidationError(
+ ugettext("This field requires 7 or 8 digits."))
+
+ return value
+
+class ARCUITField(RegexField):
+ """
+ This field validates a CUIT (C�digo �nico de Identificaci�n Tributaria). A
+ CUIT is of the form XX-XXXXXXXX-V. The last digit is a check digit.
+ """
+ def __init__(self, *args, **kwargs):
+ super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$',
+ error_message=ugettext('Enter a valid CUIT in XX-XXXXXXXX-X or
XXXXXXXXXXXX format.'),
+ *args, **kwargs)
+
+ def clean(self, value):
+ """
+ Value can be either a string in the format XX-XXXXXXXX-X or an
+ 11-digit number.
+ """
+ value = super(ARCUITField, self).clean(value)
+ if value in EMPTY_VALUES:
+ return u''
+ value, cd = self._canon(value)
+ if self._calc_cd(value) != cd:
+ raise ValidationError(ugettext("Invalid CUIT."))
+ return self._format(value, cd)
+
+ def _canon(self, cuit):
+ cuit = cuit.replace('-', '')
+ return cuit[:-1], cuit[-1]
+
+ def _calc_cd(self, cuit):
+ mults = (5, 4, 3, 2, 7, 6, 5, 4, 3, 2)
+ tmp = sum([m * int(cuit[idx]) for idx, m in enumerate(mults)])
+ return str(11 - tmp % 11)
+
+ def _format(self, cuit, check_digit=None):
+ if check_digit == None:
+ check_digit = cuit[-1]
+ cuit = cuit[:-1]
+ return u'%s-%s-%s' % (cuit[:2], cuit[2:], check_digit)
+
Modified: django/trunk/tests/regressiontests/forms/localflavor.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavor.py 2007-09-14
00:52:39 UTC (rev 6144)
+++ django/trunk/tests/regressiontests/forms/localflavor.py 2007-09-14
00:58:57 UTC (rev 6145)
@@ -1514,4 +1514,294 @@
>>> s = NLProvinceSelect()
>>> s.render('provinces', 'OV')
u'<select name="provinces">\n<option value="DR">Drente</option>\n<option
value="FL">Flevoland</option>\n<option value="FR">Friesland</option>\n<option
value="GL">Gelderland</option>\n<option value="GR">Groningen</option>\n<option
value="LB">Limburg</option>\n<option value="NB">Noord-Brabant</option>\n<option
value="NH">Noord-Holland</option>\n<option value="OV"
selected="selected">Overijssel</option>\n<option
value="UT">Utrecht</option>\n<option value="ZE">Zeeland</option>\n<option
value="ZH">Zuid-Holland</option>\n</select>'
+
+# ARProvinceField #############################################################
+
+>>> from django.contrib.localflavor.ar.forms import ARProvinceSelect
+>>> f = ARProvinceSelect()
+>>> f.render('provincias', 'A')
+u'<select name="provincias">\n<option value="B">Buenos Aires</option>\n<option
value="K">Catamarca</option>\n<option value="H">Chaco</option>\n<option
value="U">Chubut</option>\n<option value="C">Ciudad Aut\xf3noma de Buenos
Aires</option>\n<option value="X">C\xf3rdoba</option>\n<option
value="W">Corrientes</option>\n<option value="E">Entre
R\xedos</option>\n<option value="P">Formosa</option>\n<option
value="Y">Jujuy</option>\n<option value="L">La Pampa</option>\n<option
value="F">La Rioja</option>\n<option value="M">Mendoza</option>\n<option
value="N">Misiones</option>\n<option value="Q">Neuqu\xe9n</option>\n<option
value="R">R\xedo Negro</option>\n<option value="A"
selected="selected">Salta</option>\n<option value="J">San
Juan</option>\n<option value="D">San Luis</option>\n<option value="Z">Santa
Cruz</option>\n<option value="S">Santa Fe</option>\n<option value="G">Santiago
del Estero</option>\n<option value="V">Tierra del Fuego, Ant\xe1rtida e Islas
del Atl\xe1ntico Sur<!
/option>\n<option value="T">Tucum\xe1n</option>\n</select>'
+
+# ARPostalCodeField ###########################################################
+
+>>> from django.contrib.localflavor.ar.forms import ARPostalCodeField
+>>> f = ARPostalCodeField()
+>>> f.clean('5000')
+u'5000'
+>>> f.clean('C1064AAB')
+u'C1064AAB'
+>>> f.clean('c1064AAB')
+u'C1064AAB'
+>>> f.clean('C1064aab')
+u'C1064AAB'
+>>> f.clean(u'4400')
+u'4400'
+>>> f.clean(u'C1064AAB')
+u'C1064AAB'
+>>> f.clean('C1064AABB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at most 8 characters (it has 9).']
+>>> f.clean('C1064AA')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('C106AAB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('106AAB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('500')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at least 4 characters (it has 3).']
+>>> f.clean('5PPP')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(u'')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = ARPostalCodeField(required=False)
+>>> f.clean('5000')
+u'5000'
+>>> f.clean('C1064AAB')
+u'C1064AAB'
+>>> f.clean('c1064AAB')
+u'C1064AAB'
+>>> f.clean('C1064aab')
+u'C1064AAB'
+>>> f.clean(u'4400')
+u'4400'
+>>> f.clean(u'C1064AAB')
+u'C1064AAB'
+>>> f.clean('C1064AABB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at most 8 characters (it has 9).']
+>>> f.clean('C1064AA')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('C106AAB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('106AAB')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean('500')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure this value has at least 4 characters (it has 3).']
+>>> f.clean('5PPP')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a postal code in the format NNNN or ANNNNAAA.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+>>> f.clean(u'')
+u''
+
+# ARDNIField ##################################################################
+
+>>> from django.contrib.localflavor.ar.forms import ARDNIField
+>>> f = ARDNIField()
+>>> f.clean('20123456')
+u'20123456'
+>>> f.clean('20.123.456')
+u'20123456'
+>>> f.clean('9123456')
+u'9123456'
+>>> f.clean('9.123.456')
+u'9123456'
+>>> f.clean(u'20123456')
+u'20123456'
+>>> f.clean(u'20.123.456')
+u'20123456'
+>>> f.clean('20.123456')
+u'20123456'
+>>> f.clean('101234566')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires 7 or 8 digits.']
+>>> f.clean('W0123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires only numbers.']
+>>> f.clean('10,123,456')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires only numbers.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(u'')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = ARDNIField(required=False)
+>>> f.clean('20123456')
+u'20123456'
+>>> f.clean('20.123.456')
+u'20123456'
+>>> f.clean('9123456')
+u'9123456'
+>>> f.clean('9.123.456')
+u'9123456'
+>>> f.clean(u'20123456')
+u'20123456'
+>>> f.clean(u'20.123.456')
+u'20123456'
+>>> f.clean('20.123456')
+u'20123456'
+>>> f.clean('101234566')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires 7 or 8 digits.']
+>>> f.clean('W0123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires only numbers.']
+>>> f.clean('10,123,456')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field requires only numbers.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+>>> f.clean(u'')
+u''
+
+# ARCUITField #################################################################
+
+>>> from django.contrib.localflavor.ar.forms import ARCUITField
+>>> f = ARCUITField()
+>>> f.clean('20-10123456-9')
+u'20-10123456-9'
+>>> f.clean(u'20-10123456-9')
+u'20-10123456-9'
+>>> f.clean('27-10345678-4')
+u'27-10345678-4'
+>>> f.clean('20101234569')
+u'20-10123456-9'
+>>> f.clean('27103456784')
+u'27-10345678-4'
+>>> f.clean('2-10123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('210123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456-')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456-5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(u'2-10123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('27-10345678-1')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(u'27-10345678-1')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(u'')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+
+>>> f = ARCUITField(required=False)
+>>> f.clean('20-10123456-9')
+u'20-10123456-9'
+>>> f.clean(u'20-10123456-9')
+u'20-10123456-9'
+>>> f.clean('27-10345678-4')
+u'27-10345678-4'
+>>> f.clean('20101234569')
+u'20-10123456-9'
+>>> f.clean('27103456784')
+u'27-10345678-4'
+>>> f.clean('2-10123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('210123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456-')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('20-10123456-5')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(u'2-10123456-9')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX
format.']
+>>> f.clean('27-10345678-1')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(u'27-10345678-1')
+Traceback (most recent call last):
+...
+ValidationError: [u'Invalid CUIT.']
+>>> f.clean(None)
+u''
+>>> f.clean('')
+u''
+>>> f.clean(u'')
+u''
"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
