Ticket #16304: placeholder.patch

fields.py

@@ -179 +179 @@
         return result
 
 class CharField(Field):
-    def __init__(self, max_length=None, min_length=None, *args, **kwargs):
-        self.max_length, self.min_length = max_length, min_length
+    def __init__(self, max_length=None, min_length=None, placeholder=None, *args, **kwargs):
+        self.max_length, self.min_length, self.placeholder = max_length, min_length, placeholder
         super(CharField, self).__init__(*args, **kwargs)
         if min_length is not None:
             self.validators.append(validators.MinLengthValidator(min_length))
@@ -194 +194 @@
         return smart_unicode(value)
 
     def widget_attrs(self, widget):
+        attrs = {}
+        if self.placeholder is not None  and isinstance(widget, TextInput):
+            attrs["placeholder"] = str(self.placeholder)
         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['maxlength'] = str(self.max_length)
+        if attrs:
+            return attrs
 
 class IntegerField(Field):
     default_error_messages = {