diff --git a/django/newforms/extras/widgets.py b/django/newforms/extras/widgets.py index 1011934fb8..724dcd9b50 100644 --- a/django/newforms/extras/widgets.py +++ b/django/newforms/extras/widgets.py @@ -2,9 +2,10 @@ Extra HTML Widget classes """ +import datetime + from django.newforms.widgets import Widget, Select from django.utils.dates import MONTHS -import datetime __all__ = ('SelectDateWidget',) diff --git a/django/newforms/fields.py b/django/newforms/fields.py index 509c099e86..30c675c14a 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -2,14 +2,16 @@ Field classes """ -from django.utils.translation import gettext -from django.utils.encoding import smart_unicode -from util import ErrorList, ValidationError -from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple import datetime import re import time +from django.utils.translation import gettext +from django.utils.encoding import smart_unicode + +from util import ErrorList, ValidationError +from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple + __all__ = ( 'Field', 'CharField', 'IntegerField', 'DEFAULT_DATE_INPUT_FORMATS', 'DateField', diff --git a/django/newforms/forms.py b/django/newforms/forms.py index 0923cd50ea..952f41a8c9 100644 --- a/django/newforms/forms.py +++ b/django/newforms/forms.py @@ -2,13 +2,15 @@ Form classes """ -from django.utils.datastructures import SortedDict, MultiValueDict +import copy + +from django.utils.datastructures import SortedDict from django.utils.html import escape from django.utils.encoding import StrAndUnicode + from fields import Field -from widgets import TextInput, Textarea, HiddenInput, MultipleHiddenInput +from widgets import TextInput, Textarea from util import flatatt, ErrorDict, ErrorList, ValidationError -import copy __all__ = ('BaseForm', 'Form') diff --git a/django/newforms/models.py b/django/newforms/models.py index 9d7d027031..1f783429be 100644 --- a/django/newforms/models.py +++ b/django/newforms/models.py @@ -4,13 +4,16 @@ and database field objects. """ from django.utils.translation import gettext + from util import ValidationError -from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList +from forms import BaseForm, SortedDictFromList from fields import Field, ChoiceField from widgets import Select, SelectMultiple, MultipleHiddenInput -__all__ = ('save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields', - 'ModelChoiceField', 'ModelMultipleChoiceField') +__all__ = ( + 'save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields', + 'ModelChoiceField', 'ModelMultipleChoiceField' +) def save_instance(form, instance, fields=None, fail_message='saved', commit=True): """ diff --git a/django/newforms/util.py b/django/newforms/util.py index 5fc0223f5b..cc17ff4f7f 100644 --- a/django/newforms/util.py +++ b/django/newforms/util.py @@ -1,6 +1,4 @@ -from django.conf import settings from django.utils.html import escape -from django.utils.functional import Promise, lazy from django.utils.encoding import smart_unicode # Converts a dictionary to a single string with key="value", XML-style with diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py index dd71ebc455..6ee3177a25 100644 --- a/django/newforms/widgets.py +++ b/django/newforms/widgets.py @@ -2,24 +2,26 @@ HTML Widget classes """ -__all__ = ( - 'Widget', 'TextInput', 'PasswordInput', 'HiddenInput', 'MultipleHiddenInput', - 'FileInput', 'Textarea', 'CheckboxInput', - 'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect', 'CheckboxSelectMultiple', - 'MultiWidget', 'SplitDateTimeWidget', -) - -from util import flatatt -from django.utils.datastructures import MultiValueDict -from django.utils.html import escape -from django.utils.translation import gettext -from django.utils.encoding import StrAndUnicode, smart_unicode -from itertools import chain - try: set # Only available in Python 2.4+ except NameError: from sets import Set as set # Python 2.3 fallback +from itertools import chain + +from django.utils.datastructures import MultiValueDict +from django.utils.html import escape +from django.utils.translation import gettext +from django.utils.encoding import StrAndUnicode, smart_unicode + +from util import flatatt + +__all__ = ( + 'Widget', 'TextInput', 'PasswordInput', + 'HiddenInput', 'MultipleHiddenInput', + 'FileInput', 'Textarea', 'CheckboxInput', + 'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect', + 'CheckboxSelectMultiple', 'MultiWidget', 'SplitDateTimeWidget', +) class Widget(object): is_hidden = False # Determines whether this corresponds to an .