Ticket #15912: 15912.diff

tests/regressiontests/forms/tests/fields.py

@@ -36 +36 @@
 from django.forms.widgets import RadioFieldRenderer
 from django.utils.unittest import TestCase
 
-
 def fix_os_paths(x):
     if isinstance(x, basestring):
         return x.replace('\\', '/')
@@ -109 +108 @@
         self.assertEqual(f.max_length, None)
         self.assertEqual(f.min_length, 10)
 
+    def test_charfield_widget_attrs(self):
+        f = CharField()
+        # Return an empty dictionary if min_length is None
+        self.assertEqual(f.widget_attrs(TextInput()), {})
+
+        # Or if the widget is not TextInput or PasswordInput
+        f = CharField(max_length=10)
+        self.assertEqual(f.widget_attrs(HiddenInput()), {})
+
+        # Otherwise, should return a maxlength attribute equal to max_length
+        self.assertEqual(f.widget_attrs(TextInput()), {'maxlength': '10'})
+        self.assertEqual(f.widget_attrs(PasswordInput()), {'maxlength': '10'})
+
+        f = CharField(max_length=20)
+        self.assertEqual(f.widget_attrs(TextInput()), {'maxlength': '20'})
+        self.assertEqual(f.widget_attrs(PasswordInput()), {'maxlength': '20'})
+
     # IntegerField ################################################################
 
     def test_integerfield_1(self):

django/forms/fields.py

@@ -199 +199 @@
         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)}
+        else:
+            return {}
 
 class IntegerField(Field):
     default_error_messages = {