summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 13:57:14 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-04-04 13:57:14 +0000
commitbc65445e8d311093d2b2142f81d1554b55bfe822 (patch)
tree52918a6c5043d2395f0accabbb25e953e7b28c2e
parentf529a1f12ea4f96f1d3de1458f77bcfdf4229879 (diff)
Cleaned up [4924]. Sorry; wasn't concentrating enough.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/newforms/forms.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index 5d7adfe812..1f37da91ff 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -5,7 +5,6 @@ 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
@@ -229,9 +228,9 @@ class BoundField(StrAndUnicode):
value = self.as_widget(self.field.widget)
if not isinstance(value, basestring):
# Some Widget render() methods -- notably RadioSelect -- return a
- # "special" object rather than a string. Call the __str__() on that
+ # "special" object rather than a string. Call __unicode__() on that
# object to get its rendered value.
- value = value.__unicode__()
+ value = unicode(value)
return value
def _errors(self):