Merge e57c436c4f into 836e49b535

docs/tutorial/3-class-based-views.md

@@ -8,7 +8,7 @@ We'll start by rewriting the root view as a class-based view.  All this involves
 
     from snippets.models import Snippet
     from snippets.serializers import SnippetSerializer
-    from django.http import Http404
+    from django.shortcuts import get_object_or_404
     from rest_framework.views import APIView
     from rest_framework.response import Response
     from rest_framework import status
@@ -37,10 +37,9 @@ So far, so good.  It looks pretty similar to the previous case, but we've got be
         Retrieve, update or delete a snippet instance.
         """
         def get_object(self, pk):
-            try:
+            snippet = get_object_or_404(Snippet, pk=pk)
-                return Snippet.objects.get(pk=pk)
+            
-            except Snippet.DoesNotExist:
+            return snippet
-                raise Http404
 
         def get(self, request, pk, format=None):
             snippet = self.get_object(pk)