Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #3153 -- newforms 'label' argument now can contain wacky charac…

…ters. Thanks, dswistowski

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cd394a246aa32e5ce15b0643203b7bfdeb703eb6 1 parent bce9f65
@adrianholovaty adrianholovaty authored
Showing with 10 additions and 0 deletions.
  1. +2 −0  django/newforms/fields.py
  2. +8 −0 tests/regressiontests/forms/tests.py
View
2  django/newforms/fields.py
@@ -34,6 +34,8 @@ class Field(object):
creation_counter = 0
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
if isinstance(widget, type):
View
8 tests/regressiontests/forms/tests.py
@@ -2062,6 +2062,14 @@
<li>Password1: <input type="password" name="password1" /></li>
<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 #########################################################
Sometimes it's necessary to have multiple forms display on the same HTML page,
Please sign in to comment.
Something went wrong with that request. Please try again.