summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Smith <nick.smith@torchbox.com>2015-06-11 14:34:03 +0100
committerTim Graham <timograham@gmail.com>2015-06-11 12:22:24 -0400
commitffbb6d4742823ace864158647350e0aa0419937e (patch)
tree67313ce57ff843b162b281fd5d06c5c4b5e7d02f
parent76c526f80e43b0bf5199dfe33b1ce31e813fa2fb (diff)
[1.8.x] Used PEP 8 style indentation in forms docs.
Backport of b9bf61ce61ea933c3fefa05fa1ded8dfb1b445e5 from master
-rw-r--r--docs/ref/forms/fields.txt34
-rw-r--r--docs/ref/forms/validation.txt6
-rw-r--r--docs/ref/forms/widgets.txt15
3 files changed, 31 insertions, 24 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index e51007c5f4..c8317924d9 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -452,20 +452,20 @@ For each field, we describe the default widget used if you don't specify
If no ``input_formats`` argument is provided, the default input formats are::
['%Y-%m-%d', # '2006-10-25'
- '%m/%d/%Y', # '10/25/2006'
- '%m/%d/%y'] # '10/25/06'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y'] # '10/25/06'
Additionally, if you specify :setting:`USE_L10N=False<USE_L10N>` in your settings, the
following will also be included in the default input formats::
['%b %d %Y', # 'Oct 25 2006'
- '%b %d, %Y', # 'Oct 25, 2006'
- '%d %b %Y', # '25 Oct 2006'
- '%d %b, %Y', # '25 Oct, 2006'
- '%B %d %Y', # 'October 25 2006'
- '%B %d, %Y', # 'October 25, 2006'
- '%d %B %Y', # '25 October 2006'
- '%d %B, %Y'] # '25 October, 2006'
+ '%b %d, %Y', # 'Oct 25, 2006'
+ '%d %b %Y', # '25 Oct 2006'
+ '%d %b, %Y', # '25 Oct, 2006'
+ '%B %d %Y', # 'October 25 2006'
+ '%B %d, %Y', # 'October 25, 2006'
+ '%d %B %Y', # '25 October 2006'
+ '%d %B, %Y'] # '25 October, 2006'
See also :ref:`format localization <format-localization>`.
@@ -491,14 +491,14 @@ For each field, we describe the default widget used if you don't specify
If no ``input_formats`` argument is provided, the default input formats are::
['%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
- '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
- '%Y-%m-%d', # '2006-10-25'
- '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
- '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
- '%m/%d/%Y', # '10/25/2006'
- '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
- '%m/%d/%y %H:%M', # '10/25/06 14:30'
- '%m/%d/%y'] # '10/25/06'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
+ '%m/%d/%Y %H:%M', # '10/25/2006 14:30'
+ '%m/%d/%Y', # '10/25/2006'
+ '%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
+ '%m/%d/%y %H:%M', # '10/25/06 14:30'
+ '%m/%d/%y'] # '10/25/06'
See also :ref:`format localization <format-localization>`.
diff --git a/docs/ref/forms/validation.txt b/docs/ref/forms/validation.txt
index 64f5cd391e..cf633bfb85 100644
--- a/docs/ref/forms/validation.txt
+++ b/docs/ref/forms/validation.txt
@@ -365,8 +365,10 @@ example::
if cc_myself and subject:
# Only do something if both fields are valid so far.
if "help" not in subject:
- raise forms.ValidationError("Did not send for 'help' in "
- "the subject despite CC'ing yourself.")
+ raise forms.ValidationError(
+ "Did not send for 'help' in the subject despite "
+ "CC'ing yourself."
+ )
.. versionchanged:: 1.7
diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt
index 78d40c9727..bcc4b3a10e 100644
--- a/docs/ref/forms/widgets.txt
+++ b/docs/ref/forms/widgets.txt
@@ -56,9 +56,11 @@ for a :class:`~django.forms.extras.widgets.SelectDateWidget`::
from django.forms.extras.widgets import SelectDateWidget
BIRTH_YEAR_CHOICES = ('1980', '1981', '1982')
- FAVORITE_COLORS_CHOICES = (('blue', 'Blue'),
- ('green', 'Green'),
- ('black', 'Black'))
+ FAVORITE_COLORS_CHOICES = (
+ ('blue', 'Blue'),
+ ('green', 'Green'),
+ ('black', 'Black'),
+ )
class SimpleForm(forms.Form):
birth_year = forms.DateField(widget=SelectDateWidget(years=BIRTH_YEAR_CHOICES))
@@ -354,8 +356,11 @@ foundation for custom widgets.
widget.value_from_datadict(data, files, name + '_%s' % i)
for i, widget in enumerate(self.widgets)]
try:
- D = date(day=int(datelist[0]), month=int(datelist[1]),
- year=int(datelist[2]))
+ D = date(
+ day=int(datelist[0]),
+ month=int(datelist[1]),
+ year=int(datelist[2]),
+ )
except ValueError:
return ''
else: