Ticket #16304: 16304_v2.patch

docs/ref/forms/fields.txt

@@ -330 +330 @@
     If provided, these arguments ensure that the string is at most or at least
     the given length.
 
+    .. note::
+
+        If you are using HTML5 templates, you can pass a placeholder attribute
+        containg a string, which will act as the placeholder for the resulting
+        input box.
+
 ``ChoiceField``
 ~~~~~~~~~~~~~~~
 

django/forms/fields.py

@@ -182 +182 @@
         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))
@@ -201 +203 @@
         if self.max_length is not None and isinstance(widget, (TextInput, PasswordInput)):
             # The HTML attribute is maxlength, not max_length.
             attrs.update({'maxlength': str(self.max_length)})
+        if self.placeholder and isinstance(widget, TextInput):
+            attrs.update({'placeholder': self.placeholder})
         return attrs
 
 class IntegerField(Field):

tests/regressiontests/forms/tests/forms.py

@@ -930 +930 @@
             password = CharField(max_length=10, widget=PasswordInput)
             realname = CharField(max_length=10, widget=TextInput) # redundantly define widget, just to test
             address = CharField()                                 # no max_length defined here
+            data1 = CharField(placeholder='Enter random data')    # checking for the HTML5 placeholder attribute
+            data2 = CharField(max_length=10, placeholder='Random')# this time with max_length given
 
         p = UserRegistration(auto_id=False)
         self.assertHTMLEqual(p.as_ul(), """<li>Username: <input type="text" name="username" maxlength="10" /></li>
 <li>Password: <input type="password" name="password" maxlength="10" /></li>
 <li>Realname: <input type="text" name="realname" maxlength="10" /></li>
-<li>Address: <input type="text" name="address" /></li>""")
+<li>Address: <input type="text" name="address" /></li>
+<li>Data1: <input type="text" name="data1" placeholder="Enter random data" /></li>
+<li>Data2: <input type="text" name="data2" maxlength="10" placeholder="Random" /></li>""")
 
         # If you specify a custom "attrs" that includes the "maxlength" attribute,
         # the Field's max_length attribute will override whatever "maxlength" you specify