Author: mtredinnick
Date: 2007-10-03 20:54:58 -0500 (Wed, 03 Oct 2007)
New Revision: 6452
Modified:
django/trunk/django/oldforms/__init__.py
Log:
Fixed a Python 2.3 Unicode + oldforms problem. Refs #5287.
Modified: django/trunk/django/oldforms/__init__.py
===================================================================
--- django/trunk/django/oldforms/__init__.py 2007-10-04 01:20:27 UTC (rev
6451)
+++ django/trunk/django/oldforms/__init__.py 2007-10-04 01:54:58 UTC (rev
6452)
@@ -500,7 +500,7 @@
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 @@
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)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
