Permalink
Browse files

Removed django.contrib.localflavor.

Each localflavor lives on as a separate app.
  • Loading branch information...
1 parent b2d20e9 commit f27a4ee3270bd57299ce02d622978ac4d839137e @aaugustin aaugustin committed Dec 24, 2012
Showing 304 changed files with 49 additions and 257,012 deletions.
View
@@ -57,11 +57,6 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
source_lang = en
-[django.contrib-localflavor]
-file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po
-source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
-source_lang = en
-
[django.contrib-messages]
file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
@@ -1,5 +1,4 @@
from django.contrib.gis.db import models
-from django.contrib.localflavor.us.models import USStateField
from django.utils.encoding import python_2_unicode_compatible
@python_2_unicode_compatible
@@ -11,7 +10,7 @@ def __str__(self): return self.point.wkt
@python_2_unicode_compatible
class City(models.Model):
name = models.CharField(max_length=50)
- state = USStateField()
+ state = models.CharField(max_length=2)
location = models.ForeignKey(Location)
objects = models.GeoManager()
def __str__(self): return self.name
@@ -16,7 +16,6 @@
from django.contrib.gis.gdal.field import (
OFTDate, OFTDateTime, OFTInteger, OFTReal, OFTString, OFTTime)
from django.db import models, transaction
-from django.contrib.localflavor.us.models import USStateField
from django.utils import six
from django.utils.encoding import force_text
@@ -55,7 +54,6 @@ class LayerMapping(object):
models.SlugField : OFTString,
models.TextField : OFTString,
models.URLField : OFTString,
- USStateField : OFTString,
models.BigIntegerField : (OFTInteger, OFTReal, OFTString),
models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),
models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),
@@ -1,2 +0,0 @@
-import warnings
-warnings.warn("django.contrib.localflavor is deprecated. Use the separate django-localflavor-* packages instead.", DeprecationWarning)
@@ -1,37 +0,0 @@
-# -*- 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.
-"""
-from __future__ import unicode_literals
-
-PROVINCE_CHOICES = (
- ('B', 'Buenos Aires'),
- ('K', 'Catamarca'),
- ('H', 'Chaco'),
- ('U', 'Chubut'),
- ('C', 'Ciudad Autónoma de Buenos Aires'),
- ('X', 'Córdoba'),
- ('W', 'Corrientes'),
- ('E', 'Entre Ríos'),
- ('P', 'Formosa'),
- ('Y', 'Jujuy'),
- ('L', 'La Pampa'),
- ('F', 'La Rioja'),
- ('M', 'Mendoza'),
- ('N', 'Misiones'),
- ('Q', 'Neuquén'),
- ('R', 'Río Negro'),
- ('A', 'Salta'),
- ('J', 'San Juan'),
- ('D', 'San Luis'),
- ('Z', 'Santa Cruz'),
- ('S', 'Santa Fe'),
- ('G', 'Santiago del Estero'),
- ('V', 'Tierra del Fuego, Antártida e Islas del Atlántico Sur'),
- ('T', 'Tucumán'),
-)
@@ -1,128 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-AR-specific Form helpers.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.localflavor.ar.ar_provinces import PROVINCE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import RegexField, CharField, Select
-from django.utils.translation import ugettext_lazy as _
-
-
-class ARProvinceSelect(Select):
- """
- A Select widget that uses a list of Argentinean provinces/autonomous cities
- as its choices.
- """
- def __init__(self, attrs=None):
- 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/cpa/que_es
- http://www.correoargentino.com.ar/cpa/como_escribirlo
- """
- default_error_messages = {
- 'invalid': _("Enter a postal code in the format NNNN or ANNNNAAA."),
- }
-
- 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}$',
- max_length, min_length, *args, **kwargs)
-
- def clean(self, value):
- value = super(ARPostalCodeField, self).clean(value)
- if value in EMPTY_VALUES:
- return ''
- if len(value) not in (4, 8):
- raise ValidationError(self.error_messages['invalid'])
- if len(value) == 8:
- return '%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.
- """
- default_error_messages = {
- 'invalid': _("This field requires only numbers."),
- 'max_digits': _("This field requires 7 or 8 digits."),
- }
-
- 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):
- """
- 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 ''
- if not value.isdigit():
- value = value.replace('.', '')
- if not value.isdigit():
- raise ValidationError(self.error_messages['invalid'])
- if len(value) not in (7, 8):
- raise ValidationError(self.error_messages['max_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.
- """
- default_error_messages = {
- 'invalid': _('Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format.'),
- 'checksum': _("Invalid CUIT."),
- 'legal_type': _('Invalid legal type. Type must be 27, 20, 23 or 30.'),
- }
-
- def __init__(self, max_length=None, min_length=None, *args, **kwargs):
- super(ARCUITField, self).__init__(r'^\d{2}-?\d{8}-?\d$',
- max_length, min_length, *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 ''
- value, cd = self._canon(value)
- if not value[:2] in ['27', '20', '23', '30']:
- raise ValidationError(self.error_messages['legal_type'])
- if self._calc_cd(value) != cd:
- raise ValidationError(self.error_messages['checksum'])
- return self._format(value, cd)
-
- def _canon(self, cuit):
- cuit = cuit.replace('-', '')
- return cuit[:-1], cuit[-1]
-
- def _calc_cd(self, cuit):
- # Calculation code based on:
- # http://es.wikipedia.org/wiki/C%C3%B3digo_%C3%9Anico_de_Identificaci%C3%B3n_Tributaria
- mults = (5, 4, 3, 2, 7, 6, 5, 4, 3, 2)
- tmp = sum([m * int(cuit[idx]) for idx, m in enumerate(mults)])
- result = 11 - (tmp % 11)
- if result == 11:
- result = 0
- elif result == 10:
- result = 9
- return str(result)
-
- def _format(self, cuit, check_digit=None):
- if check_digit is None:
- check_digit = cuit[-1]
- cuit = cuit[:-1]
- return '%s-%s-%s' % (cuit[:2], cuit[2:], check_digit)
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*
-from django.utils.translation import ugettext_lazy as _
-
-STATE_CHOICES = (
- ('BL', _('Burgenland')),
- ('KA', _('Carinthia')),
- ('NO', _('Lower Austria')),
- ('OO', _('Upper Austria')),
- ('SA', _('Salzburg')),
- ('ST', _('Styria')),
- ('TI', _('Tyrol')),
- ('VO', _('Vorarlberg')),
- ('WI', _('Vienna')),
-)
@@ -1,69 +0,0 @@
-"""
-AT-specific Form helpers
-"""
-from __future__ import unicode_literals
-import re
-
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.translation import ugettext_lazy as _
-
-re_ssn = re.compile(r'^\d{4} \d{6}')
-
-
-class ATZipCodeField(RegexField):
- """
- A form field that validates its input is an Austrian postcode.
-
- Accepts 4 digits (first digit must be greater than 0).
- """
- default_error_messages = {
- 'invalid': _('Enter a zip code in the format XXXX.'),
- }
- def __init__(self, max_length=None, min_length=None, *args, **kwargs):
- super(ATZipCodeField, self).__init__(r'^[1-9]{1}\d{3}$',
- max_length, min_length, *args, **kwargs)
-
-class ATStateSelect(Select):
- """
- A Select widget that uses a list of AT states as its choices.
- """
- def __init__(self, attrs=None):
- from django.contrib.localflavor.at.at_states import STATE_CHOICES
- super(ATStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
-
-class ATSocialSecurityNumberField(Field):
- """
- Austrian Social Security numbers are composed of a 4 digits and 6 digits
- field. The latter represents in most cases the person's birthdate while
- the first 4 digits represent a 3-digits counter and a one-digit checksum.
-
- The 6-digits field can also differ from the person's birthdate if the
- 3-digits counter suffered an overflow.
-
- This code is based on information available on
- http://de.wikipedia.org/wiki/Sozialversicherungsnummer#.C3.96sterreich
- """
-
- default_error_messages = {
- 'invalid': _('Enter a valid Austrian Social Security Number in XXXX XXXXXX format.'),
- }
-
- def clean(self, value):
- value = super(ATSocialSecurityNumberField, self).clean(value)
- if value in EMPTY_VALUES:
- return ""
- if not re_ssn.search(value):
- raise ValidationError(self.error_messages['invalid'])
- sqnr, date = value.split(" ")
- sqnr, check = (sqnr[:3], (sqnr[3]))
- if int(sqnr) < 100:
- raise ValidationError(self.error_messages['invalid'])
- res = int(sqnr[0])*3 + int(sqnr[1])*7 + int(sqnr[2])*9 \
- + int(date[0])*5 + int(date[1])*8 + int(date[2])*4 \
- + int(date[3])*2 + int(date[4])*1 + int(date[5])*6
- res = res % 11
- if res != int(check):
- raise ValidationError(self.error_messages['invalid'])
- return '%s%s %s'%(sqnr, check, date,)
@@ -1,17 +0,0 @@
-"""
-An alphabetical list of states for use as `choices` in a formfield.
-
-This exists in this standalone file so that it's only imported into memory
-when explicitly needed.
-"""
-
-STATE_CHOICES = (
- ('ACT', 'Australian Capital Territory'),
- ('NSW', 'New South Wales'),
- ('NT', 'Northern Territory'),
- ('QLD', 'Queensland'),
- ('SA', 'South Australia'),
- ('TAS', 'Tasmania'),
- ('VIC', 'Victoria'),
- ('WA', 'Western Australia'),
-)
@@ -1,60 +0,0 @@
-"""
-Australian-specific Form helpers
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-import re
-
-from django.contrib.localflavor.au.au_states import STATE_CHOICES
-from django.core.validators import EMPTY_VALUES
-from django.forms import ValidationError
-from django.forms.fields import Field, RegexField, Select
-from django.utils.encoding import smart_text
-from django.utils.translation import ugettext_lazy as _
-
-
-PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')
-
-class AUPostCodeField(RegexField):
- """ Australian post code field.
-
- Assumed to be 4 digits.
- Northern Territory 3-digit postcodes should have leading zero.
- """
- default_error_messages = {
- 'invalid': _('Enter a 4 digit postcode.'),
- }
-
- def __init__(self, max_length=4, min_length=None, *args, **kwargs):
- super(AUPostCodeField, self).__init__(r'^\d{4}$',
- max_length, min_length, *args, **kwargs)
-
-
-class AUPhoneNumberField(Field):
- """Australian phone number field."""
- default_error_messages = {
- 'invalid': 'Phone numbers must contain 10 digits.',
- }
-
- def clean(self, value):
- """
- Validate a phone number. Strips parentheses, whitespace and hyphens.
- """
- super(AUPhoneNumberField, self).clean(value)
- if value in EMPTY_VALUES:
- return ''
- value = re.sub('(\(|\)|\s+|-)', '', smart_text(value))
- phone_match = PHONE_DIGITS_RE.search(value)
- if phone_match:
- return '%s' % phone_match.group(1)
- raise ValidationError(self.error_messages['invalid'])
-
-
-class AUStateSelect(Select):
- """
- A Select widget that uses a list of Australian states/territories as its
- choices.
- """
- def __init__(self, attrs=None):
- super(AUStateSelect, self).__init__(attrs, choices=STATE_CHOICES)
Oops, something went wrong.

0 comments on commit f27a4ee

Please sign in to comment.