summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 4cd2911eaa..7f8bac5052 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -197,9 +197,11 @@ class CharField(Field):
return smart_unicode(value)
def widget_attrs(self, widget):
+ attrs = super(CharField, self).widget_attrs(widget)
if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
# The HTML attribute is maxlength, not max_length.
- return {'maxlength': str(self.max_length)}
+ attrs.update({'maxlength': str(self.max_length)})
+ return attrs
class IntegerField(Field):
default_error_messages = {