Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4318 -- Fixed unused imports and other various style tweaks in…

… newforms. Thanks, Gary Wilson

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4868af8a57f9b0e72310a9ca05d23da415f6d29b 1 parent 6f44cff
@adrianholovaty adrianholovaty authored
View
3  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',)
View
8 django/newforms/fields.py
@@ -2,13 +2,15 @@
Field classes
"""
+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
-import datetime
-import re
-import time
__all__ = (
'Field', 'CharField', 'IntegerField',
View
8 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')
View
9 django/newforms/models.py
@@ -4,13 +4,16 @@
"""
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):
"""
View
2  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
View
26 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',
-)
+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 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 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 <input type="hidden">.

0 comments on commit 4868af8

Please sign in to comment.
Something went wrong with that request. Please try again.