Changeset 4223

Timestamp:

12/17/06 13:04:03 (2 years ago)

Author:

adrian

Message:

Fixed #3153 -- newforms 'label' argument now can contain wacky characters. Thanks, dswistowski

Files:

• django/trunk/django/newforms/fields.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (1 diff)

django/trunk/django/newforms/fields.py

@@ -35 +35 @@
-
-    def __init__(self, required=True, widget=None, label=None):
+        if label is not None:
+            label = smart_unicode(label)
-        self.required, self.label = required, label
-        widget = widget or self.widget

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

@@ -2063 +2063 @@
-<li>Password (again): <input type="password" name="password2" /></li>
-
+A label can be a Unicode object or a bytestring with special characters.
+>>> class UserRegistration(Form):
+...    username = CharField(max_length=10, label='ŠĐĆŽćžšđ')
+...    password = CharField(widget=PasswordInput, label=u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111')
+>>> p = UserRegistration(auto_id=False)
+>>> p.as_ul()
+u'<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="text" name="username" maxlength="10" /></li>\n<li>\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111: <input type="password" name="password" /></li>'
+
-# Forms with prefixes #########################################################
-