Ticket #3947: newforms-unicode.diff

django/newforms/forms.py

@@ -4 +4 @@
 
 from django.utils.datastructures import SortedDict, MultiValueDict
 from django.utils.html import escape
-from django.utils.encoding import StrAndUnicode
+from django.utils.encoding import StrAndUnicode, smart_unicode
 from fields import Field
 from widgets import TextInput, Textarea, HiddenInput, MultipleHiddenInput
 from util import flatatt, ErrorDict, ErrorList, ValidationError
@@ -127 +127 @@
                     help_text = help_text_html % field.help_text
                 else:
                     help_text = u''
-                output.append(normal_row % {'errors': bf_errors, 'label': label, 'field': unicode(bf), 'help_text': help_text})
+                output.append(normal_row % {'errors': bf_errors, 'label': smart_unicode(label), 'field': unicode(bf), 'help_text': help_text})
         if top_errors:
             output.insert(0, error_row % top_errors)
         if hidden_fields: # Insert any hidden fields in the last row.

django/newforms/widgets.py

@@ -162 +162 @@
         for option_value, option_label in chain(self.choices, choices):
             option_value = smart_unicode(option_value)
             selected_html = (option_value == str_value) and u' selected="selected"' or ''
-            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(smart_unicode(option_label))))
+            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, smart_unicode(escape(option_label))))
         output.append(u'</select>')
         return u'\n'.join(output)