From a6ccc8cc06e6b304e35f7a16f6067e6fa09b63ce Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Tue, 15 Nov 2011 09:36:08 +0000 Subject: Fixed #15912 -- Ensured that `forms.CharField.widget_attrs()` always returns a dictionary. Thanks to tsabi and rubyruy for the report and to mmcnickle and prestontimmons for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17096 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/fields.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'django/forms') 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 = { -- cgit v1.3