Browse files

Fixed #5811 -- Added an explicit conversion to unicode that was other…

…wise causing problems in some cases. Thanks, Mike Maravillo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent efed04b commit 931b9f310854e30a814cb3073c67007e709f6e5f @malcolmt malcolmt committed Feb 29, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/newforms/forms.py
View
4 django/newforms/forms.py
@@ -129,7 +129,7 @@ def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_
bf_errors = self.error_class([escape(error) for error in bf.errors]) # Escape and cache in local variable.
if bf.is_hidden:
if bf_errors:
- top_errors.extend(['(Hidden field %s) %s' % (name, force_unicode(e)) for e in bf_errors])
+ top_errors.extend([u'(Hidden field %s) %s' % (name, force_unicode(e)) for e in bf_errors])
hidden_fields.append(unicode(bf))
else:
if errors_on_separate_row and bf_errors:
@@ -150,7 +150,7 @@ def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_
help_text = u''
output.append(normal_row % {'errors': force_unicode(bf_errors), 'label': force_unicode(label), 'field': unicode(bf), 'help_text': help_text})
if top_errors:
- output.insert(0, error_row % top_errors)
+ output.insert(0, error_row % force_unicode(top_errors))
if hidden_fields: # Insert any hidden fields in the last row.
str_hidden = u''.join(hidden_fields)
if output:

0 comments on commit 931b9f3

Please sign in to comment.