Remove all relative imports. We have always been at war with relative imports. (396fcaae) · Commits · Dom Sekotill / django

django/contrib/localflavor/ar/forms.py

+5 −2

Original line number	Diff line number	Diff line
		@@ -3,18 +3,21 @@
		AR-specific Form helpers.
		"""

		from django.forms import ValidationError
		from __future__ import absolute_import

		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):
		from ar_provinces import PROVINCE_CHOICES
		super(ARProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)

		class ARPostalCodeField(RegexField):

+5 −1

Original line number	Diff line number	Diff line
		"""
		Australian-specific Form helpers
		"""

		from __future__ import absolute_import

		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_unicode
		from django.utils.translation import ugettext_lazy as _


		PHONE_DIGITS_RE = re.compile(r'^(\d{10})$')

		class AUPostCodeField(RegexField):
		@@ -52,5 +57,4 @@ class AUStateSelect(Select):
		choices.
		"""
		def __init__(self, attrs=None):
		from au_states import STATE_CHOICES
		super(AUStateSelect, self).__init__(attrs, choices=STATE_CHOICES)

+12 −8

Original line number	Diff line number	Diff line
		"""
		Belgium-specific Form helpers
		"""

		from __future__ import absolute_import

		from django.contrib.localflavor.be.be_provinces import PROVINCE_CHOICES
		from django.contrib.localflavor.be.be_regions import REGION_CHOICES
		from django.forms.fields import RegexField, Select
		from django.utils.translation import ugettext_lazy as _


		class BEPostalCodeField(RegexField):
		"""
		A form field that validates its input as a belgium postal code.
		@@ -55,7 +61,6 @@ class BERegionSelect(Select):
		A Select widget that uses a list of belgium regions as its choices.
		"""
		def __init__(self, attrs=None):
		from be_regions import REGION_CHOICES
		super(BERegionSelect, self).__init__(attrs, choices=REGION_CHOICES)

		class BEProvinceSelect(Select):
		@@ -63,5 +68,4 @@ class BEProvinceSelect(Select):
		A Select widget that uses a list of belgium provinces as its choices.
		"""
		def __init__(self, attrs=None):
		from be_provinces import PROVINCE_CHOICES
		super(BEProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)

+6 −3

Original line number	Diff line number	Diff line
		@@ -3,12 +3,17 @@
		BR-specific Form helpers
		"""

		from __future__ import absolute_import

		import re

		from django.contrib.localflavor.br.br_states import STATE_CHOICES
		from django.core.validators import EMPTY_VALUES
		from django.forms import ValidationError
		from django.forms.fields import Field, RegexField, CharField, Select
		from django.utils.encoding import smart_unicode
		from django.utils.translation import ugettext_lazy as _
		import re


		phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')

		@@ -42,7 +47,6 @@ class BRStateSelect(Select):
		as its choices.
		"""
		def __init__(self, attrs=None):
		from br_states import STATE_CHOICES
		super(BRStateSelect, self).__init__(attrs, choices=STATE_CHOICES)

		class BRStateChoiceField(Field):
		@@ -58,7 +62,6 @@ class BRStateChoiceField(Field):
		initial=None, help_text=None):
		super(BRStateChoiceField, self).__init__(required, widget, label,
		initial, help_text)
		from br_states import STATE_CHOICES
		self.widget.choices = STATE_CHOICES

		def clean(self, value):

+6 −3

Original line number	Diff line number	Diff line
		@@ -2,12 +2,17 @@
		Canada-specific Form helpers
		"""

		from __future__ import absolute_import

		import re

		from django.contrib.localflavor.ca.ca_provinces import PROVINCE_CHOICES, PROVINCES_NORMALIZED
		from django.core.validators import EMPTY_VALUES
		from django.forms import ValidationError
		from django.forms.fields import Field, CharField, Select
		from django.utils.encoding import smart_unicode
		from django.utils.translation import ugettext_lazy as _
		import re


		phone_digits_re = re.compile(r'^(?:1-?)?(\d{3})[-\.]?(\d{3})[-\.]?(\d{4})$')
		sin_re = re.compile(r"^(\d{3})-(\d{3})-(\d{3})$")
		@@ -66,7 +71,6 @@ class CAProvinceField(Field):
		}

		def clean(self, value):
		from ca_provinces import PROVINCES_NORMALIZED
		super(CAProvinceField, self).clean(value)
		if value in EMPTY_VALUES:
		return u''
		@@ -87,7 +91,6 @@ class CAProvinceSelect(Select):
		territories as its choices.
		"""
		def __init__(self, attrs=None):
		from ca_provinces import PROVINCE_CHOICES # relative import
		super(CAProvinceSelect, self).__init__(attrs, choices=PROVINCE_CHOICES)

		class CASocialInsuranceNumberField(Field):