From 4d8561a8a8f802f6874979d72eb7facbe20b5f09 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Thu, 4 Oct 2007 01:54:58 +0000
Subject: [PATCH] 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
---
 django/oldforms/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/oldforms/__init__.py b/django/oldforms/__init__.py
index 9bb90416c4..5f7b9fc2ad 100644
--- a/django/oldforms/__init__.py
+++ b/django/oldforms/__init__.py
@@ -500,7 +500,7 @@ class SelectField(FormField):
             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 @@ class SelectMultipleField(SelectField):
             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)