diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-17 16:56:18 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-17 16:56:18 +0000 |
| commit | 544a8372fd7b27e5ba4672d127986bc82b4e739a (patch) | |
| tree | 548ad3d202e3b368e25ab269121c73fab0627ae7 /django/forms | |
| parent | 1856e398c54f65e97e69ee78c9dae61044ab7318 (diff) | |
Remove several more relative imports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/fields.py | 16 | ||||
| -rw-r--r-- | django/forms/models.py | 15 | ||||
| -rw-r--r-- | django/forms/widgets.py | 4 |
3 files changed, 20 insertions, 15 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index ab83b8b411..8e727b4abb 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -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', diff --git a/django/forms/models.py b/django/forms/models.py index 254cca3db8..b65f067846 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -3,20 +3,21 @@ Helper functions for creating Form classes from Django models and database field objects. """ +from __future__ import absolute_import + from django.core.exceptions import ValidationError, NON_FIELD_ERRORS, FieldError from django.core.validators import EMPTY_VALUES - +from django.forms.fields import Field, ChoiceField +from django.forms.forms import BaseForm, get_declared_fields +from django.forms.formsets import BaseFormSet, formset_factory +from django.forms.util import ErrorList +from django.forms.widgets import (SelectMultiple, HiddenInput, + MultipleHiddenInput, media_property) from django.utils.encoding import smart_unicode, force_unicode from django.utils.datastructures import SortedDict from django.utils.text import get_text_list, capfirst from django.utils.translation import ugettext_lazy as _, ugettext -from util import ErrorList -from forms import BaseForm, get_declared_fields -from fields import Field, ChoiceField -from widgets import SelectMultiple, HiddenInput, MultipleHiddenInput -from widgets import media_property -from formsets import BaseFormSet, formset_factory __all__ = ( 'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model', diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 3797c163bd..1c16f288a9 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -2,13 +2,15 @@ HTML Widget classes """ +from __future__ import absolute_import + import copy import datetime from itertools import chain from urlparse import urljoin -from util import flatatt from django.conf import settings +from django.forms.util import flatatt from django.utils.datastructures import MultiValueDict, MergeDict from django.utils.html import escape, conditional_escape from django.utils.translation import ugettext, ugettext_lazy |
