[1.7.x] Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships.

Thanks EvilDMP for the suggestion.

Backport of ec08d62a20 from master

1 files changed, 11 insertions, 4 deletions

diff --git a/docs/topics/db/examples/one_to_one.txt b/docs/topics/db/examples/one_to_one.txt
index 89d422aecd..b66d52d369 100644
--- a/docs/topics/db/examples/one_to_one.txt
+++ b/docs/topics/db/examples/one_to_one.txt
@@ -61,10 +61,17 @@ A Place can access its restaurant, if available::
 
 p2 doesn't have an associated restaurant::
 
-    >>> p2.restaurant
-    Traceback (most recent call last):
-        ...
-    DoesNotExist: Restaurant matching query does not exist.
+    >>> from django.core.exceptions import ObjectDoesNotExist
+    >>> try:
+    >>>     p2.restaurant
+    >>> except ObjectDoesNotExist:
+    >>>     print("There is no restaurant here.")
+    There is no restaurant here.
+
+You can also use ``hasattr`` to avoid the need for exception catching::
+
+    >>> hasattr(p2, 'restaurant')
+    False
 
 Set the place using assignment notation. Because place is the primary key on
 Restaurant, the save will create a new restaurant::