From dbd72b850b487be37df2940d16697a2d57b73ac6 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 14 May 2016 19:06:31 -0400 Subject: [1.9.x] Refs #26021 -- Used hanging indentation in some doc examples. Backport of e475e849703d937e158e75e7a6d9cb99090857f6 from master --- docs/topics/db/queries.txt | 9 +++------ docs/topics/testing/tools.txt | 6 ++++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'docs/topics') diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt index 6d2cbd9175..0cb6b1db1f 100644 --- a/docs/topics/db/queries.txt +++ b/docs/topics/db/queries.txt @@ -519,8 +519,7 @@ will return ``Blog`` objects that have an empty ``name`` on the ``author`` and also those which have an empty ``author`` on the ``entry``. If you don't want those latter objects, you could write:: - Blog.objects.filter(entry__authors__isnull=False, - entry__authors__name__isnull=True) + Blog.objects.filter(entry__authors__isnull=False, entry__authors__name__isnull=True) Spanning multi-valued relationships ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -556,14 +555,12 @@ select all blogs that contain entries with both *"Lennon"* in the headline and that were published in 2008 (the same entry satisfying both conditions), we would write:: - Blog.objects.filter(entry__headline__contains='Lennon', - entry__pub_date__year=2008) + Blog.objects.filter(entry__headline__contains='Lennon', entry__pub_date__year=2008) To select all blogs that contain an entry with *"Lennon"* in the headline **as well as** an entry that was published in 2008, we would write:: - Blog.objects.filter(entry__headline__contains='Lennon').filter( - entry__pub_date__year=2008) + Blog.objects.filter(entry__headline__contains='Lennon').filter(entry__pub_date__year=2008) Suppose there is only one blog that had both entries containing *"Lennon"* and entries from 2008, but that none of the entries from 2008 contained *"Lennon"*. diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index f9a8bafa77..8890afcf08 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -1693,9 +1693,11 @@ and contents:: class EmailTest(TestCase): def test_send_email(self): # Send message. - mail.send_mail('Subject here', 'Here is the message.', + mail.send_mail( + 'Subject here', 'Here is the message.', 'from@example.com', ['to@example.com'], - fail_silently=False) + fail_silently=False, + ) # Test that one message has been sent. self.assertEqual(len(mail.outbox), 1) -- cgit v1.3