Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a Python 2.3 Unicode + oldforms problem. Refs #5287.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4d8561a8a8f802f6874979d72eb7facbe20b5f09 1 parent 3c18331
@malcolmt malcolmt authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/oldforms/__init__.py
View
4 django/oldforms/__init__.py
@@ -500,7 +500,7 @@ def render(self, data):
selected_html = u''
if smart_unicode(value) == str_data:
selected_html = u' selected="selected"'
- output.append(u' <option value="%s"%s>%s</option>' % (escape(value), selected_html, escape(display_name)))
+ output.append(u' <option value="%s"%s>%s</option>' % (escape(value), selected_html, force_unicode(escape(display_name))))
output.append(u' </select>')
return u'\n'.join(output)
@@ -612,7 +612,7 @@ def render(self, data):
selected_html = u''
if smart_unicode(value) in str_data_list:
selected_html = u' selected="selected"'
- output.append(u' <option value="%s"%s>%s</option>' % (escape(value), selected_html, escape(choice)))
+ output.append(u' <option value="%s"%s>%s</option>' % (escape(value), selected_html, force_unicode(escape(choice))))
output.append(u' </select>')
return u'\n'.join(output)
Please sign in to comment.
Something went wrong with that request. Please try again.