Ticket #5741: 5741.diff

django/db/models/query.py

@@ -293 +293 @@
         Performs the query and returns a single object matching the given
         keyword arguments.
         """
+        has_default = False
+        if 'default' in kwargs:
+            default_value = kwargs.pop('default')
+            has_default = True
         clone = self.filter(*args, **kwargs)
         num = len(clone)
         if num == 1:
             return clone._result_cache[0]
         if not num:
+            if has_default:
+                return default_value
             raise self.model.DoesNotExist("%s matching query does not exist."
                     % self.model._meta.object_name)
         raise self.model.MultipleObjectsReturned("get() returned more than one %s -- it returned %s! Lookup parameters were %s"

tests/modeltests/basic/models.py

@@ -100 +100 @@
     ...
 DoesNotExist: Article matching query does not exist.
 
+# You can specify a default keyword argument to get()
+>>> Article.objects.get(pk=97, default=False)
+False
+
 # Lookup by a primary key is the most common case, so Django provides a
 # shortcut for primary-key exact lookups.
 # The following is identical to articles.get(id=1).

docs/db-api.txt

@@ -1110 +1110 @@
     except ObjectDoesNotExist:
         print "Either the entry or blog doesn't exist."
 
+**New in Django development version**
+
+``get()`` may take a keyword argument named ``default``, similar to the ``get()``
+method of a python dictionary. When ``default`` is specified and no object is
+found, the value of ``default`` is returned. If ``default`` is not specified, the
+``DoesNotExist`` exception is raised as usual.
+
+For models with a field named ``default``, the more verbose ``default__exact``
+lookup syntax must be used.
+
 ``create(**kwargs)``
 ~~~~~~~~~~~~~~~~~~~~