Ticket #4785: div-widgets.diff

django/newforms/widgets.py

@@ -239 +239 @@
         return u'<input%s />' % flatatt(final_attrs)
 
 class RadioFieldRenderer(StrAndUnicode):
+    tags = { 'block' : u'<ul>\n%s\n</ul>', 'item': u'<li>%s</li>' }
     "An object used by RadioSelect to enable customization of radio widgets."
     def __init__(self, name, value, attrs, choices):
         self.name, self.value, self.attrs = name, value, attrs
@@ -254 +255 @@
 
     def __unicode__(self):
         "Outputs a <ul> for this set of radio fields."
-        return u'<ul>\n%s\n</ul>' % u'\n'.join([u'<li>%s</li>' % force_unicode(w) for w in self])
+        return self.tags['block'] % u'\n'.join([self.tags['item'] % force_unicode(w) for w in self])
 
 class RadioSelect(Select):
     def render(self, name, value, attrs=None, choices=()):
@@ -275 +276 @@
     id_for_label = classmethod(id_for_label)
 
 class CheckboxSelectMultiple(SelectMultiple):
+    tags = { 'block' : u'<ul>\n%s\n</ul>', 'item' : u'<li><label>%(input)s %(label)s</label></li>' }
     def render(self, name, value, attrs=None, choices=()):
         if value is None: value = []
         has_id = attrs and 'id' in attrs
         final_attrs = self.build_attrs(attrs, name=name)
-        output = [u'<ul>']
+        output = []
         str_values = set([force_unicode(v) for v in value]) # Normalize to strings.
         for i, (option_value, option_label) in enumerate(chain(self.choices, choices)):
             # If an ID attribute was given, add a numeric index as a suffix,
@@ -289 +291 @@
             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)
-            output.append(u'<li><label>%s %s</label></li>' % (rendered_cb, escape(force_unicode(option_label))))
-        output.append(u'</ul>')
-        return u'\n'.join(output)
+            output.append(self.tags['item'] % {'input': rendered_cb, 'label': escape(force_unicode(option_label))})
+        return self.tags['block'] % u'\n'.join(output)
 
     def id_for_label(self, id_):
         # See the comment for RadioSelect.id_for_label()