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>
-:
-:
-:
+
+
+