Ticket #17922: 17922-2.diff

django/forms/forms.py

@@ -170 +170 @@
                     if self.label_suffix:
                         if label[-1] not in ':?.!':
                             label = format_html('{0}{1}', label, self.label_suffix)
-                    label = bf.label_tag(label) or ''
+                    label = bf.label_tag(label, attrs={}) or ''
                 else:
                     label = ''
 
@@ -507 +507 @@
         widget = self.field.widget
         id_ = widget.attrs.get('id') or self.auto_id
         if id_:
+            if (attrs is None and self.field.required and
+                    hasattr(self.form, 'required_css_class')):
+                attrs = {'class': self.form.required_css_class}
             attrs = attrs and flatatt(attrs) or ''
             contents = format_html('<label for="{0}"{1}>{2}</label>',
                                    widget.id_for_label(id_), attrs, contents

tests/regressiontests/forms/tests/forms.py

@@ -1759 +1759 @@
 <tr><th><label for="id_email">Email:</label></th><td><input type="text" name="email" id="id_email" /></td></tr>
 <tr class="required error"><th><label for="id_age">Age:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="age" id="id_age" /></td></tr>""")
 
+        self.assertHTMLEqual(p['age'].label_tag(), '<label for="id_age" class="required">Age</label>')
+
     def test_label_split_datetime_not_displayed(self):
         class EventForm(Form):
             happened_at = SplitDateTimeField(widget=widgets.SplitHiddenDateTimeWidget)