Ticket #4975: label_colon_removal.patch

django/newforms/forms.py

@@ -129 +129 @@
-                    output.append(error_row % force_unicode(bf_errors))
-                if bf.label:
-                    label = escape(force_unicode(bf.label))
-                    # Only add a colon if the label does not end in punctuation.
-                    if label[-1] not in ':?.!':
-                        label += ':'
-                    label = bf.label_tag(label) or ''
-                else:
-                    label = ''

tests/modeltests/model_forms/models.py

@@ -80 +80 @@
->>> CategoryForm = form_for_model(Category)
->>> f = CategoryForm()
->>> print f
-:
-:
-:
+
+
+
->>> print f.as_ul()
-:
-:
-:
+
+
+
->>> print f['name']
-<input id="id_name" type="text" name="name" maxlength="20" />
-
->>> f = CategoryForm(auto_id=False)
->>> print f.as_ul()
-:
-:
-:
+
+
+
-
->>> f = CategoryForm({'name': 'Entertainment', 'slug': 'entertainment', 'url': 'entertainment'})
->>> f.is_valid()
@@ -164 +164 @@
->>> ArticleForm = form_for_model(Article)
->>> f = ArticleForm(auto_id=False)
->>> print f
-:
-:
-:
-:
+
+
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Mike Royko</option>
-<option value="2">Bob Woodward</option>
-</select></td></tr>
-:
-:
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Draft</option>
-<option value="2">Pending</option>
-<option value="3">Live</option>
-</select></td></tr>
-:
+
-<option value="1">Entertainment</option>
-<option value="2">It&#39;s a test</option>
-<option value="3">Third test</option>
@@ -194 +194 @@
->>> PartialArticleForm = form_for_model(Article, fields=('headline','pub_date'))
->>> f = PartialArticleForm(auto_id=False)
->>> print f
-:
-:
+
+
-
-You can pass a custom Form class to form_for_model. Make sure it's a
-subclass of BaseForm, not Form.
@@ -214 +214 @@
->>> RoykoForm = form_for_instance(w)
->>> f = RoykoForm(auto_id=False)
->>> print f
-:
+
-
->>> art = Article(headline='Test article', slug='test-article', pub_date=datetime.date(1988, 1, 4), writer=w, article='Hello.')
->>> art.save()
@@ -223 +223 @@
->>> TestArticleForm = form_for_instance(art)
->>> f = TestArticleForm(auto_id=False)
->>> print f.as_ul()
-:
-:
-:
-:
+
+
+
+
-<option value="">---------</option>
-<option value="1" selected="selected">Mike Royko</option>
-<option value="2">Bob Woodward</option>
-</select></li>
-:
-:
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Draft</option>
-<option value="2">Pending</option>
-<option value="3">Live</option>
-</select></li>
-:
+
-<option value="1">Entertainment</option>
-<option value="2">It&#39;s a test</option>
-<option value="3">Third test</option>
@@ -258 +258 @@
->>> PartialArticleForm = form_for_instance(art, fields=('headline', 'slug', 'pub_date'))
->>> f = PartialArticleForm({'headline': u'New headline', 'slug': 'new-headline', 'pub_date': u'1988-01-04'}, auto_id=False)
->>> print f.as_ul()
-:
-:
-:
+
+
+
->>> f.is_valid()
-True
->>> new_art = f.save()
@@ -279 +279 @@
->>> TestArticleForm = form_for_instance(new_art)
->>> f = TestArticleForm(auto_id=False)
->>> print f.as_ul()
-:
-:
-:
-:
+
+
+
+
-<option value="">---------</option>
-<option value="1" selected="selected">Mike Royko</option>
-<option value="2">Bob Woodward</option>
-</select></li>
-:
-:
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Draft</option>
-<option value="2">Pending</option>
-<option value="3">Live</option>
-</select></li>
-:
+
-<option value="1" selected="selected">Entertainment</option>
-<option value="2">It&#39;s a test</option>
-<option value="3">Third test</option>
@@ -387 +387 @@
->>> ArticleForm = form_for_model(Article)
->>> f = ArticleForm(auto_id=False)
->>> print f.as_ul()
-:
-:
-:
-:
+
+
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Mike Royko</option>
-<option value="2">Bob Woodward</option>
-</select></li>
-:
-:
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Draft</option>
-<option value="2">Pending</option>
-<option value="3">Live</option>
-</select></li>
-:
+
-<option value="1">Entertainment</option>
-<option value="2">It&#39;s a test</option>
-<option value="3">Third</option>
@@ -412 +412 @@
->>> Writer.objects.create(name='Carl Bernstein')
-<Writer: Carl Bernstein>
->>> print f.as_ul()
-:
-:
-:
-:
+
+
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Mike Royko</option>
-<option value="2">Bob Woodward</option>
-<option value="3">Carl Bernstein</option>
-</select></li>
-:
-:
+
+
-<option value="" selected="selected">---------</option>
-<option value="1">Draft</option>
-<option value="2">Pending</option>
-<option value="3">Live</option>
-</select></li>
-:
+
-<option value="1">Entertainment</option>
-<option value="2">It&#39;s a test</option>
-<option value="3">Third</option>

tests/regressiontests/forms/tests.py

@@ -347 +347 @@
-...     somechoice = ChoiceField(choices=chain((('', '-'*9),), [(thing['id'], thing['name']) for thing in things]))
->>> f = SomeForm()
->>> f.as_table()
-:
+
->>> f.as_table()
-:
+
->>> f = SomeForm({'somechoice': 2})
->>> f.as_table()
-:
+
-
-You can also pass 'choices' to the constructor:
->>> w = Select(choices=[(1, 1), (2, 2), (3, 3)])
@@ -2048 +2048 @@
-Last name Lennon
-Birthday 1940-10-9
->>> print p
-:
-:
-:
+
+
+
-
-Empty dictionaries are valid, too.
->>> p = Person({})
@@ -2065 +2065 @@
-...
-AttributeError: 'Person' object has no attribute 'cleaned_data'
->>> print p
-:
-:
-:
+
+
+
->>> print p.as_table()
-:
-:
-:
+
+
+
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p.as_p()
-<ul class="errorlist"><li>This field is required.</li></ul>
-:
+
-<ul class="errorlist"><li>This field is required.</li></ul>
-:
+
-<ul class="errorlist"><li>This field is required.</li></ul>
-:
+
-
-If you don't pass any values to the Form's __init__(), or if you pass None,
-the Form will be considered unbound and won't do any validation. Form.errors
@@ -2099 +2099 @@
-...
-AttributeError: 'Person' object has no attribute 'cleaned_data'
->>> print p
-:
-:
-:
+
+
+
->>> print p.as_table()
-:
-:
-:
+
+
+
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p.as_p()
-:
-:
-:
+
+
+
-
-Unicode values are handled properly.
->>> p = Person({'first_name': u'John', 'last_name': u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111', 'birthday': '1940-10-9'})
->>> p.as_table()
-:</label></th><td><input type="text" name="first_name" value="John" id="id_first_name" /></td></tr>\n<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></td></tr>\n<tr><th><label for="id_birthday">Birthday:
+</label></th><td><input type="text" name="first_name" value="John" id="id_first_name" /></td></tr>\n<tr><th><label for="id_last_name">Last name</label></th><td><input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></td></tr>\n<tr><th><label for="id_birthday">Birthday
->>> p.as_ul()
-:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></li>\n<li><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></li>\n<li><label for="id_birthday">Birthday:
+</label> <input type="text" name="first_name" value="John" id="id_first_name" /></li>\n<li><label for="id_last_name">Last name</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></li>\n<li><label for="id_birthday">Birthday
->>> p.as_p()
-:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></p>\n<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></p>\n<p><label for="id_birthday">Birthday:
+</label> <input type="text" name="first_name" value="John" id="id_first_name" /></p>\n<p><label for="id_last_name">Last name</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></p>\n<p><label for="id_birthday">Birthday
-
->>> p = Person({'last_name': u'Lennon'})
->>> p.errors
@@ -2200 +2200 @@
-the human-readable labels for a field.
->>> p = Person(auto_id='%s_id')
->>> print p.as_table()
-:
-:
-:
+
+
+
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p.as_p()
-:
-:
-:
+
+
+
-
-If auto_id is any True value whose str() does not contain '%s', the "id"
-attribute will be the name of the field.
->>> p = Person(auto_id=True)
->>> print p.as_ul()
-:
-:
-:
+
+
+
-
-If auto_id is any False value, an "id" attribute won't be output unless it
-was manually entered.
->>> p = Person(auto_id=False)
->>> print p.as_ul()
-:
-:
-:
+
+
+
-
-In this example, auto_id is False, but the "id" attribute for the "first_name"
-field is given. Also note that field gets a <label>, while the others don't.
@@ -2236 +2236 @@
-...     birthday = DateField()
->>> p = PersonNew(auto_id=False)
->>> print p.as_ul()
-:
-:
-:
+
+
+
-
-If the "id" attribute is specified in the Form and auto_id is True, the "id"
-attribute in the Form gets precedence.
->>> p = PersonNew(auto_id=True)
->>> print p.as_ul()
-:
-:
-:
+
+
+
-
->>> class SignupForm(Form):
-...     email = EmailField()
@@ -2394 +2394 @@
-<li><label><input type="radio" name="language" value="J" /> Java</label></li>
-</ul>
->>> print f
-:
-:
+
+
-<li><label><input type="radio" name="language" value="P" /> Python</label></li>
-<li><label><input type="radio" name="language" value="J" /> Java</label></li>
-</ul></td></tr>
->>> print f.as_ul()
-:
-:
+
+
-<li><label><input type="radio" name="language" value="P" /> Python</label></li>
-<li><label><input type="radio" name="language" value="J" /> Java</label></li>
-</ul></li>
@@ -2420 +2420 @@
-either as_table() or as_ul(), the label for the RadioSelect will point to the
-ID of the *first* radio button.
->>> print f
-:
-:
+
+
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></td></tr>
->>> print f.as_ul()
-:
-:
+
+
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></li>
->>> print f.as_p()
-:
-:
+
+
-<li><label><input type="radio" id="id_language_0" value="P" name="language" /> Python</label></li>
-<li><label><input type="radio" id="id_language_1" value="J" name="language" /> Java</label></li>
-</ul></p>
@@ -2531 +2531 @@
-...     composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=MultipleHiddenInput)
->>> f = SongFormHidden(MultiValueDict(dict(name=['Yesterday'], composers=['J', 'P'])), auto_id=False)
->>> print f.as_ul()
-:
+
-<input type="hidden" name="composers" value="P" /></li>
-
-When using CheckboxSelectMultiple, the framework expects a list of input and
@@ -2558 +2558 @@
-
->>> f = EscapingForm({'special_name': "Nothing to escape"}, auto_id=False)
->>> print f
-:
+
->>> f = EscapingForm({'special_name': "Should escape < & > and <script>alert('xss')</script>"}, auto_id=False)
->>> print f
-:
+
-
-# Validating multiple fields in relation to another ###########################
-
@@ -2615 +2615 @@
-{}
->>> f = UserRegistration({}, auto_id=False)
->>> print f.as_table()
-:
-:
-:
+
+
+
->>> f.errors
-{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']}
->>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)
@@ -2625 +2625 @@
-{'__all__': [u'Please make sure your passwords match.']}
->>> print f.as_table()
-<tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr>
-:
-:
-:
+
+
+
->>> print f.as_ul()
-<li><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></li>
-:
-:
-:
+
+
+
->>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'foo'}, auto_id=False)
->>> f.errors
-{}
@@ -2652 +2652 @@
-...         self.fields['birthday'] = DateField()
->>> p = Person(auto_id=False)
->>> print p
-:
-:
-:
+
+
+
-
-Instances of a dynamic Form do not persist fields from one Form instance to
-the next.
@@ -2666 +2666 @@
->>> field_list = [('field1', CharField()), ('field2', CharField())]
->>> my_form = MyForm(field_list=field_list)
->>> print my_form
-:
-:
+
+
->>> field_list = [('field3', CharField()), ('field4', CharField())]
->>> my_form = MyForm(field_list=field_list)
->>> print my_form
-:
-:
+
+
-
->>> class MyForm(Form):
-...     default_field_1 = CharField()
@@ -2684 +2684 @@
->>> field_list = [('field1', CharField()), ('field2', CharField())]
->>> my_form = MyForm(field_list=field_list)
->>> print my_form
-:
-:
-:
-:
+
+
+
+
->>> field_list = [('field3', CharField()), ('field4', CharField())]
->>> my_form = MyForm(field_list=field_list)
->>> print my_form
-:
-:
-:
-:
+
+
+
+
-
-Similarly, changes to field attributes do not persist from one Form instance
-to the next.
@@ -2752 +2752 @@
-...     birthday = DateField()
->>> p = Person(auto_id=False)
->>> print p
-:
-:
-:
+
+
+
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p.as_p()
-:
-:
-:
+
+
+
-
-With auto_id set, a HiddenInput still gets an ID, but it doesn't get a label.
->>> p = Person(auto_id='id_%s')
->>> print p
-:
-:
-:
+
+
+
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p.as_p()
-:
-:
-:
+
+
+
-
-If a field with a HiddenInput has errors, the as_table() and as_ul() output
-will include the error message(s) with the text "(Hidden field [fieldname]) "
@@ -2786 +2786 @@
->>> p = Person({'first_name': 'John', 'last_name': 'Lennon', 'birthday': '1940-10-9'}, auto_id=False)
->>> print p
-<tr><td colspan="2"><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></td></tr>
-:
-:
-:
+
+
+
->>> print p.as_ul()
-<li><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></li>
-:
-:
-:
+
+
+
->>> print p.as_p()
-<ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul>
-:
-:
-:
+
+
+
-
-A corner case: It's possible for a form to have only HiddenInputs.
->>> class TestForm(Form):
@@ -2830 +2830 @@
-...     field14 = CharField()
->>> p = TestForm(auto_id=False)
->>> print p
-:
-:
-:
-:
-:
-:
-:
-:
-:
-:
-:
-:
-:
-:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Some Field classes have an effect on the HTML attributes of their associated
-Widget. If you set max_length in a CharField and its associated widget is
@@ -2856 +2856 @@
-...    address = CharField()                                 # no max_length defined here
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
-:
-:
+
+
+
+
-
-If you specify a custom "attrs" that includes the "maxlength" attribute,
-the Field's max_length attribute will override whatever "maxlength" you specify
@@ -2869 +2869 @@
-...    password = CharField(max_length=10, widget=PasswordInput)
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-# Specifying labels ###########################################################
-
@@ -2883 +2883 @@
-...    password2 = CharField(widget=PasswordInput, label='Password (again)')
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
-:
+
+
+
-
-only end in a colon if they don't end in oth
+not add a colon to the label, regardless of the last charact
-punctuation already.
->>> class Questions(Form):
-...    q1 = CharField(label='The first question')
@@ -2896 +2896 @@
-...    q4 = CharField(label='Answer this question!')
-...    q5 = CharField(label='The last question. Period.')
->>> print Questions(auto_id=False).as_p()
-:
+
-<p>What is your name? <input type="text" name="q2" /></p>
-<p>The answer to life is: <input type="text" name="q3" /></p>
-<p>Answer this question! <input type="text" name="q4" /></p>
-<p>The last question. Period. <input type="text" name="q5" /></p>
->>> print Questions().as_p()
-:
+
-<p><label for="id_q2">What is your name?</label> <input type="text" name="q2" id="id_q2" /></p>
-<p><label for="id_q3">The answer to life is:</label> <input type="text" name="q3" id="id_q3" /></p>
-<p><label for="id_q4">Answer this question!</label> <input type="text" name="q4" id="id_q4" /></p>
@@ -2914 +2914 @@
-...    password = CharField(widget=PasswordInput, label=u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
->>> p = UserRegistration(auto_id=False)
->>> p.as_ul()
-: <input type="text" name="username" maxlength="10" /></li>\n<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111:
+ <input type="text" name="username" maxlength="10" /></li>\n<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111
-
-If a label is set to the empty string for a field, that field won't get a label.
->>> class UserRegistration(Form):
@@ -2923 +2923 @@
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-<li> <input type="text" name="username" maxlength="10" /></li>
-:
+
->>> p = UserRegistration(auto_id='id_%s')
->>> print p.as_ul()
-<li> <input id="id_username" type="text" name="username" maxlength="10" /></li>
-:
+
-
-If label is None, Django will auto-create the label from the field name. This
-is default behavior.
@@ -2936 +2936 @@
-...    password = CharField(widget=PasswordInput)
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration(auto_id='id_%s')
->>> print p.as_ul()
-:
-:
+
+
-
-# Initial data ################################################################
-
@@ -2957 +2957 @@
-Here, we're not submitting any data, so the initial value will be displayed.
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-Here, we're submitting data, so the initial value will *not* be displayed.
->>> p = UserRegistration({}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u''}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u'foo'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-An 'initial' value is *not* used as a fallback if data is not provided. In this
-example, we don't provide a value for 'username', and the form raises a
@@ -2998 +2998 @@
-Here, we're not submitting any data, so the initial value will be displayed.
->>> p = UserRegistration(initial={'username': 'django'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration(initial={'username': 'stephane'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-The 'initial' parameter is meaningless if you pass data.
->>> p = UserRegistration({}, initial={'username': 'django'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u''}, initial={'username': 'django'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u'foo'}, initial={'username': 'django'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-A dynamic 'initial' value is *not* used as a fallback if data is not provided.
-In this example, we don't provide a value for 'username', and the form raises a
@@ -3035 +3035 @@
-...    password = CharField(widget=PasswordInput)
->>> p = UserRegistration(initial={'username': 'babik'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-# Callable initial data ########################################################
-
@@ -3056 +3056 @@
-Here, we're not submitting any data, so the initial value will be displayed.
->>> p = UserRegistration(initial={'username': initial_django}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-The 'initial' parameter is meaningless if you pass data.
->>> p = UserRegistration({}, initial={'username': initial_django}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u''}, initial={'username': initial_django}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration({'username': u'foo'}, initial={'username': initial_django}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-A callable 'initial' value is *not* used as a fallback if data is not provided.
-In this example, we don't provide a value for 'username', and the form raises a
@@ -3089 +3089 @@
-...    password = CharField(widget=PasswordInput)
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> p = UserRegistration(initial={'username': initial_stephane}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-# Help text ###################################################################
-
@@ -3105 +3105 @@
-...    password = CharField(widget=PasswordInput, help_text='Choose wisely.')
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
->>> print p.as_p()
-:
-:
+
+
->>> print p.as_table()
-:
-:
+
+
-
-The help text is displayed whether or not data is provided for the form.
->>> p = UserRegistration({'username': u'foo'}, auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-help_text is not displayed for hidden fields. It can be used for documentation
-purposes, though.
@@ -3128 +3128 @@
-...    next = CharField(widget=HiddenInput, initial='/', help_text='Redirect destination')
->>> p = UserRegistration(auto_id=False)
->>> print p.as_ul()
-:
-:
+
+
-
-Help text can include arbitrary Unicode characters.
->>> class UserRegistration(Form):
-...    username = CharField(max_length=10, help_text='ŠĐĆŽćžšđ')
->>> p = UserRegistration(auto_id=False)
->>> p.as_ul()
-:
+
-
-# Subclassing forms ###########################################################
-
@@ -3151 +3151 @@
-...     instrument = CharField()
->>> p = Person(auto_id=False)
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> m = Musician(auto_id=False)
->>> print m.as_ul()
-:
-:
-:
-:
+
+
+
+
-
-Yes, you can subclass multiple forms. The fields are added in the order in
-which the parent classes are listed.
@@ -3173 +3173 @@
-...     haircut_type = CharField()
->>> b = Beatle(auto_id=False)
->>> print b.as_ul()
-:
-:
-:
-:
-:
+
+
+
+
+
-
-# Forms with prefixes #########################################################
-
@@ -3199 +3199 @@
-... }
->>> p = Person(data, prefix='person1')
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> print p['first_name']
-<input type="text" name="person1-first_name" value="John" id="id_person1-first_name" />
->>> print p['last_name']
@@ -3276 +3276 @@
-...         return self.prefix and '%s-prefix-%s' % (self.prefix, field_name) or field_name
->>> p = Person(prefix='foo')
->>> print p.as_ul()
-:
-:
-:
+
+
+
->>> data = {
-...     'foo-prefix-first_name': u'John',
-...     'foo-prefix-last_name': u'Lennon',
@@ -3350 +3350 @@
-...     file1 = FileField()
->>> f = FileForm(auto_id=False)
->>> print f
-:
+
-
->>> f = FileForm(data={}, files={}, auto_id=False)
->>> print f
-:
+
-
->>> f = FileForm(data={}, files={'file1': {'filename': 'name', 'content':''}}, auto_id=False)
->>> print f
-:
+
-
->>> f = FileForm(data={}, files={'file1': 'something that is not a file'}, auto_id=False)
->>> print f
-:
+
-
->>> f = FileForm(data={}, files={'file1': {'filename': 'name', 'content':'some content'}}, auto_id=False)
->>> print f
-:
+
->>> f.is_valid()
-True
-
@@ -3395 +3395 @@
->>> print my_function('GET', {})
-<form action="" method="post">
-<table>
-:
-:
-:
+
+
+
-</table>
-<input type="submit" />
-</form>
@@ -3407 +3407 @@
-<form action="" method="post">
-<table>
-<tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr>
-:
-:
-:
+
+
+
-</table>
-<input type="submit" />
-</form>
@@ -3435 +3435 @@
-displaying all the errors, including any that might not be associated with a
-particular field.
->>> t = Template('''<form action="">
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration(auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
->>> print t.render(Context({'form': UserRegistration({'username': 'django'}, auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
-
@@ -3460 +3460 @@
-'label', Django will use the field name with underscores converted to spaces,
-and the initial letter capitalized.
->>> t = Template('''<form action="">
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration(auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
-
@@ -3478 +3478 @@
-Recall from above that passing the "auto_id" argument to a Form gives each
-field an "id" attribute.
->>> t = Template('''<form action="">
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration(auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
->>> print t.render(Context({'form': UserRegistration(auto_id='id_%s')}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
-
-User form.[field].help_text to output a field's help text. If the given field
-does not have help text, nothing will be output.
->>> t = Template('''<form action="">
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration(auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
->>> Template('{{ form.password1.help_text }}').render(Context({'form': UserRegistration(auto_id=False)}))
@@ -3530 +3530 @@
-template. If used on its own, it is displayed as a <ul> (or an empty string, if
-the list of errors is empty). You can also use it in {% if %} statements.
->>> t = Template('''<form action="">
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration({'username': 'django', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)}))
-<form action="">
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
->>> t = Template('''<form action="">
-... {{ form.non_field_errors }}
-:
-:
-:
+
+
+
-... <input type="submit" />
-... </form>''')
->>> print t.render(Context({'form': UserRegistration({'username': 'django', 'password1': 'foo', 'password2': 'bar'}, auto_id=False)}))
-<form action="">
-<ul class="errorlist"><li>Please make sure your passwords match.</li></ul>
-:
-:
-:
+
+
+
-<input type="submit" />
-</form>
-
@@ -3780 +3780 @@
-...     field1 = ComplexField(widget=w)
->>> f = ComplexFieldForm()
->>> print f
-:
+
-<select multiple="multiple" name="field1_1" id="id_field1_1">
-<option value="J">John</option>
-<option value="P">Paul</option>
@@ -3791 +3791 @@
-
->>> f = ComplexFieldForm({'field1_0':'some text','field1_1':['J','P'], 'field1_2_0':'2007-04-25', 'field1_2_1':'06:24:00'})
->>> print f
-:
+
-<select multiple="multiple" name="field1_1" id="id_field1_1">
-<option value="J" selected="selected">John</option>
-<option value="P" selected="selected">Paul</option>
@@ -3864 +3864 @@
->>> data = dict(email='invalid')
->>> f = CommentForm(data, auto_id=False, error_class=DivErrorList)
->>> print f.as_p()
-:
+
-<div class="errorlist"><div class="error">Enter a valid e-mail address.</div></div>
-:
+
-<div class="errorlist"><div class="error">This field is required.</div></div>
-:
+
-
-#################################
-# Test multipart-encoded form #

tests/regressiontests/forms/regressions.py

@@ -9 +9 @@
-...     f1 = CharField(max_length=10, widget=TextInput(attrs=extra_attrs))
-...     f2 = CharField(widget=TextInput(attrs=extra_attrs))
->>> TestForm(auto_id=False).as_p()
-: <input type="text" class="special" name="f1" maxlength="10" /></p>\n<p>F2:
+ <input type="text" class="special" name="f1" maxlength="10" /></p>\n<p>F2
-
-#######################
-# Tests for form i18n #
@@ -21 +21 @@
-...     username = CharField(max_length=10, label=ugettext_lazy('Username'))
->>> f = SomeForm()
->>> print f.as_p()
-:
+
-
-Translations are done at rendering time, so multi-lingual apps can define forms
-early and still send back the right translation.
@@ -29 +29 @@
-# XFAIL
->>> activate('de')
->>> print f.as_p()
-:
+
->>> activate('pl')
->>> f.as_p()
-:
+
->>> deactivate()
-
-Unicode decoding problems...
@@ -41 +41 @@
-...     somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label=u'\xc5\xf8\xdf')
->>> f = SomeForm()
->>> f.as_p()
-:
+
-
-Testing choice validation with UTF-8 bytestrings as input (these are the
-Russian abbreviations "мес." and "шт.".
@@ -57 +57 @@
->>> activate('ru')
->>> f = SomeForm({})
->>> f.as_p()
-:
+
->>> deactivate()
-
-Deep copying translated text shouldn't raise an error