boulder-oracle-sprint: Merged to [4905].

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4906 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 10 insertions, 9 deletions

diff --git a/django/newforms/fields.py b/django/newforms/fields.py
index 8e3da03470..72c5047030 100644
--- a/django/newforms/fields.py
+++ b/django/newforms/fields.py
@@ -38,15 +38,16 @@ class Field(object):
     def __init__(self, required=True, widget=None, label=None, initial=None, help_text=None):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
-        # widget -- A Widget class, or instance of a Widget class, that should be
-        #         used for this Field when displaying it. Each Field has a default
-        #         Widget that it'll use if you don't specify this. In most cases,
-        #         the default widget is TextInput.
-        # label -- A verbose name for this field, for use in displaying this field in
-        #         a form. By default, Django will use a "pretty" version of the form
-        #         field name, if the Field is part of a Form.
-        # initial -- A value to use in this Field's initial display. This value is
-        #            *not* used as a fallback if data isn't given.
+        # widget -- A Widget class, or instance of a Widget class, that should
+        #           be used for this Field when displaying it. Each Field has a
+        #           default Widget that it'll use if you don't specify this. In
+        #           most cases, the default widget is TextInput.
+        # label -- A verbose name for this field, for use in displaying this
+        #          field in a form. By default, Django will use a "pretty"
+        #          version of the form field name, if the Field is part of a
+        #          Form.
+        # initial -- A value to use in this Field's initial display. This value
+        #            is *not* used as a fallback if data isn't given.
         # help_text -- An optional string to use as "help text" for this Field.
         if label is not None:
             label = smart_unicode(label)