Remove several more relative imports. (544a8372) · Commits · Dom Sekotill / django

django/contrib/localflavor/us/forms.py

+8 −4

Original line number	Diff line number	Diff line
		@@ -2,12 +2,16 @@
		USA-specific Form helpers
		"""

		from __future__ import absolute_import

		import re

		from django.core.validators import EMPTY_VALUES
		from django.forms import ValidationError
		from django.forms.fields import Field, RegexField, Select, CharField
		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})$')
		ssn_re = re.compile(r"^(?P<area>\d{3})[-\ ]?(?P<group>\d{2})[-\ ]?(?P<serial>\d{4})$")
		@@ -89,7 +93,7 @@ class USStateField(Field):
		}

		def clean(self, value):
		from us_states import STATES_NORMALIZED
		from django.contrib.localflavor.us.us_states import STATES_NORMALIZED
		super(USStateField, self).clean(value)
		if value in EMPTY_VALUES:
		return u''
		@@ -109,7 +113,7 @@ class USStateSelect(Select):
		A Select widget that uses a list of U.S. states/territories as its choices.
		"""
		def __init__(self, attrs=None):
		from us_states import STATE_CHOICES
		from django.contrib.localflavor.us.us_states import STATE_CHOICES
		super(USStateSelect, self).__init__(attrs, choices=STATE_CHOICES)

		class USPSSelect(Select):
		@@ -118,5 +122,5 @@ class USPSSelect(Select):
		choices.
		"""
		def __init__(self, attrs=None):
		from us_states import USPS_CHOICES
		from django.contrib.localflavor.us.us_states import USPS_CHOICES
		super(USPSSelect, self).__init__(attrs, choices=USPS_CHOICES)

+4 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,9 @@
		"""
		UY-specific form helpers.
		"""

		from __future__ import absolute_import

		from django.core.validators import EMPTY_VALUES
		from django.forms.fields import Select, RegexField
		from django.forms import ValidationError
		@@ -14,7 +17,7 @@ class UYDepartamentSelect(Select):
		A Select widget that uses a list of Uruguayan departaments as its choices.
		"""
		def __init__(self, attrs=None):
		from uy_departaments import DEPARTAMENT_CHOICES
		from django.contrib.localflavor.uy.uy_departaments import DEPARTAMENT_CHOICES
		super(UYDepartamentSelect, self).__init__(attrs, choices=DEPARTAMENT_CHOICES)

+2 −2

Original line number	Diff line number	Diff line
		from query import *
		from subqueries import *
		from where import AND, OR
		from datastructures import EmptyResultSet
		from django.db.models.sql.datastructures import EmptyResultSet
		from django.db.models.sql.where import AND, OR

		__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']

+4 −1

Original line number	Diff line number	Diff line
		"""
		Code to manage the creation and SQL rendering of 'where' constraints.
		"""

		from __future__ import absolute_import

		import datetime
		from itertools import repeat

		from django.utils import tree
		from django.db.models.fields import Field
		from datastructures import EmptyResultSet, FullResultSet
		from django.db.models.sql.datastructures import EmptyResultSet, FullResultSet

		# Connection types
		AND = 'AND'

+9 −7

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		Field classes.
		"""

		from __future__ import absolute_import

		import copy
		import datetime
		import os
		@@ -13,21 +15,21 @@ try:
		except ImportError:
		from StringIO import StringIO

		from django.core.exceptions import ValidationError
		from django.core import validators
		from django.core.exceptions import ValidationError
		from django.forms.util import ErrorList
		from django.forms.widgets import (TextInput, PasswordInput, HiddenInput,
		MultipleHiddenInput, ClearableFileInput, CheckboxInput, Select,
		NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput,
		SplitDateTimeWidget, SplitHiddenDateTimeWidget, FILE_INPUT_CONTRADICTION)
		from django.utils import formats
		from django.utils.translation import ugettext_lazy as _
		from django.utils.encoding import smart_unicode, smart_str, force_unicode
		from django.utils.ipv6 import clean_ipv6_address
		from django.utils.translation import ugettext_lazy as _

		# Provide this import for backwards compatibility.
		from django.core.validators import EMPTY_VALUES

		from util import ErrorList
		from widgets import (TextInput, PasswordInput, HiddenInput,
		MultipleHiddenInput, ClearableFileInput, CheckboxInput, Select,
		NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput,
		SplitDateTimeWidget, SplitHiddenDateTimeWidget, FILE_INPUT_CONTRADICTION)

		__all__ = (
		'Field', 'CharField', 'IntegerField',