Changeset 4924

Timestamp:

04/04/07 08:52:35 (2 years ago)

Author:

mtredinnick

Message:

Fixed #3597 -- Fixed unicode encoding problem in form rendering. Thanks,
Georgi Stanojevski and Ville Säävuori.

Files:

• django/trunk/django/newforms/forms.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/regressions.py (modified) (2 diffs)

django/trunk/django/newforms/forms.py

@@ -6 +6 @@
-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
@@ -231 +232 @@
-            # "special" object rather than a string. Call the __str__() on that
-            # object to get its rendered value.
-str
+unicode
-        return value
-

django/trunk/tests/regressiontests/forms/regressions.py

@@ -12 +12 @@
-u'<p>F1: <input type="text" class="special" name="f1" maxlength="10" /></p>\n<p>F2: <input type="text" class="special" name="f2" /></p>'
-
- 
- 
- 
+
+
+
-There were some problems with form translations in #3600
-
+
->>> from django.utils.translation import gettext_lazy, activate, deactivate
->>> class SomeForm(Form):
@@ -27 +27 @@
-<p><label for="id_username">Benutzername:</label> <input id="id_username" type="text" name="username" maxlength="10" /></p>
->>> deactivate()
+
+Unicode decoding problems...
+>>> GENDERS = (('0', u'En tied\xe4'), ('1', u'Mies'), ('2', u'Nainen'))
+>>> class SomeForm(Form):
+...     somechoice = ChoiceField(choices=GENDERS, widget=RadioSelect())
+>>> f = SomeForm()
+>>> f.as_p()
+u'<p><label for="id_somechoice_0">Somechoice:</label> <ul>\n<li><label><input type="radio" id="id_somechoice_0" value="0" name="somechoice" /> En tied\xe4</label></li>\n<li><label><input type="radio" id="id_somechoice_1" value="1" name="somechoice" /> Mies</label></li>\n<li><label><input type="radio" id="id_somechoice_2" value="2" name="somechoice" /> Nainen</label></li>\n</ul></p>'
-"""