Ticket #4860: 4860.labels-with-fors.diff

django/newforms/widgets.py

@@ -281 +281 @@
-        self.index = index
-
-    def __unicode__(self):
-
+
+
+
+
+
-                conditional_escape(force_unicode(self.choice_label))))
-
-    def is_checked(self):
-        return self.value == self.choice_value
-
-    def tag(self):
+        final_attrs = dict(self.attrs, type='radio', name=self.name, value=self.choice_value)
-        if 'id' in self.attrs:
-
-
+
-        if self.is_checked():
-            final_attrs['checked'] = 'checked'
-        return mark_safe(u'<input%s />' % flatatt(final_attrs))
@@ -364 +368 @@
-            # so that the checkboxes don't all have the same ID attribute.
-            if has_id:
-                final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))
+                for_attr = ' for="%s_%s"' % (attrs['id'], i)
+            else:
+                for_attr = ''
-            cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
-            option_value = force_unicode(option_value)
-            rendered_cb = cb.render(name, option_value)
->%s %s</label></li>' % (
+%s>%s %s</label></li>' % (for_attr, 
-                    conditional_escape(force_unicode(option_label))))
-        output.append(u'</ul>')
-        return mark_safe(u'\n'.join(output))

tests/regressiontests/forms/regressions.py

@@ -40 +40 @@
-...     somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect(), label=u'\xc5\xf8\xdf')
->>> f = SomeForm()
->>> f.as_p()
-><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label
+ for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"
-
-Testing choice validation with UTF-8 bytestrings as input (these are the
-Russian abbreviations "мес." and "шт.".
@@ -56 +56 @@
->>> activate('ru')
->>> f = SomeForm({})
->>> f.as_p()
-><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label
+ for="id_somechoice_0"><input type="radio" id="id_somechoice_0" value="\xc5" name="somechoice" /> En tied\xe4</label></li>\n<li><label for="id_somechoice_1"><input type="radio" id="id_somechoice_1" value="\xf8" name="somechoice" /> Mies</label></li>\n<li><label for="id_somechoice_2"
->>> deactivate()
-
-Deep copying translated text shouldn't raise an error

tests/regressiontests/forms/forms.py

@@ -424 +424 @@
->>> f = FrameworkForm(auto_id='id_%s')
->>> print f['language']
-<ul>
-
-
+ for="id_language_0"
+ for="id_language_1"
-</ul>
-
-When RadioSelect is used with auto_id, and the whole form is printed using
@@ -434 +434 @@
->>> print f
-<tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
-<tr><th><label for="id_language_0">Language:</label></th><td><ul>
-
-
+ for="id_language_0"
+ for="id_language_1"
-</ul></td></tr>
->>> print f.as_ul()
-<li><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></li>
-<li><label for="id_language_0">Language:</label> <ul>
-
-
+ for="id_language_0"
+ for="id_language_1"
-</ul></li>
->>> print f.as_p()
-<p><label for="id_name">Name:</label> <input type="text" name="name" id="id_name" /></p>
-<p><label for="id_language_0">Language:</label> <ul>
-
-
+ for="id_language_0"
+ for="id_language_1"
-</ul></p>
-
-MultipleChoiceField is a special case, as its data is required to be a list:
@@ -516 +516 @@
->>> f = SongForm(auto_id='%s_id')
->>> print f['composers']
-<ul>
-
-
+ for="composers_id_0"
+ for="composers_id_1"
-</ul>
-
-Data for a MultipleChoiceField should be a list. QueryDict and MultiValueDict

tests/regressiontests/forms/widgets.py

@@ -741 +741 @@
->>> w = RadioSelect(attrs={'id':'foo'})
->>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
-<ul>
-
-
-
-
+ for="foo_0"
+ for="foo_1"
+ for="foo_2"
+ for="foo_3"
-</ul>
-
-# Attributes provided at render-time are passed to the constituent inputs
->>> w = RadioSelect()
->>> print w.render('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'})
-<ul>
-
-
-
-
+ for="bar_0"
+ for="bar_1"
+ for="bar_2"
+ for="bar_3"
-</ul>
-
-# CheckboxSelectMultiple Widget ###############################################