Ticket #13237: chioces.multigroup.diff

forms/widgets.py

@@ -414 +414 @@
             return u'<option value="%s"%s>%s</option>' % (
                 escape(option_value), selected_html,
                 conditional_escape(force_unicode(option_label)))
+        def render_group(option_value, option_label):
+            return u'<optgroup label="%s">%s</optgroup>' %(escape(force_unicode(option_value)),''.join(process_list(option_label)))
+        def process_list(l):
+            output = []
+            for option_value, option_label in l:
+                if isinstance(option_label, (list, tuple)):
+                    output.append(render_group(option_value, option_label))
+                else:
+                    output.append(render_option(option_value, option_label))
+            return output
         # Normalize to strings.
         selected_choices = set([force_unicode(v) for v in selected_choices])
-        output = []
-        for option_value, option_label in chain(self.choices, choices):
-            if isinstance(option_label, (list, tuple)):
-                output.append(u'<optgroup label="%s">' % escape(force_unicode(option_value)))
-                for option in option_label:
-                    output.append(render_option(*option))
-                output.append(u'</optgroup>')
-            else:
-                output.append(render_option(option_value, option_label))
+        output = process_list(chain(self.choices, choices))
         return u'\n'.join(output)
 
 class NullBooleanSelect(Select):