summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 13:52:35 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 13:52:35 +0000
commitf529a1f12ea4f96f1d3de1458f77bcfdf4229879 (patch)
tree938f683821f241783b07b32411caacc3a7f5a3f4 /django
parent56d56e5bac2923382fd10036dbe045412390362d (diff)
Fixed #3597 -- Fixed unicode encoding problem in form rendering. Thanks,
Georgi Stanojevski and Ville Säävuori. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/newforms/forms.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index 9affe2fc82..5d7adfe812 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -5,6 +5,7 @@ Form classes
from django.utils.datastructures import SortedDict, MultiValueDict
from django.utils.html import escape
from django.utils.encoding import StrAndUnicode
+from django.conf import settings
from fields import Field
from widgets import TextInput, Textarea, HiddenInput, MultipleHiddenInput
from util import flatatt, ErrorDict, ErrorList, ValidationError
@@ -230,7 +231,7 @@ class BoundField(StrAndUnicode):
# Some Widget render() methods -- notably RadioSelect -- return a
# "special" object rather than a string. Call the __str__() on that
# object to get its rendered value.
- value = value.__str__()
+ value = value.__unicode__()
return value
def _errors(self):