diff options
Diffstat (limited to 'django/forms/fields.py')
| -rw-r--r-- | django/forms/fields.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index f2c3b97475..47ae5e11b2 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -74,7 +74,10 @@ class Field(object): if label is not None: label = smart_unicode(label) self.required, self.label, self.initial = required, label, initial - self.help_text = smart_unicode(help_text or '') + if help_text is None: + self.help_text = u'' + else: + self.help_text = smart_unicode(help_text) widget = widget or self.widget if isinstance(widget, type): widget = widget() |