From 922ee61d8611b41e2944b6503af736b1790abe83 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 18 Mar 2013 21:05:13 +0000
Subject: Remove erronous pre_save

---
 rest_framework/generics.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 55918267..36ecf915 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -82,9 +82,6 @@ class GenericAPIView(views.APIView):
         """
         pass
 
-    def pre_save(self, obj):
-        pass
-
 
 class MultipleObjectAPIView(MultipleObjectMixin, GenericAPIView):
     """
-- 
cgit v1.2.3


From 371698331c979305b5684f864ee6bf5b6d11a44e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 4 Apr 2013 22:24:30 +0100
Subject: Tweaks

---
 rest_framework/generics.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 36ecf915..dea980a5 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -187,8 +187,7 @@ class UpdateAPIView(mixins.UpdateModelMixin,
         return self.update(request, *args, **kwargs)
 
     def patch(self, request, *args, **kwargs):
-        kwargs['partial'] = True
-        return self.update(request, *args, **kwargs)
+        return self.partial_update(request, *args, **kwargs)
 
 
 class ListCreateAPIView(mixins.ListModelMixin,
@@ -217,8 +216,7 @@ class RetrieveUpdateAPIView(mixins.RetrieveModelMixin,
         return self.update(request, *args, **kwargs)
 
     def patch(self, request, *args, **kwargs):
-        kwargs['partial'] = True
-        return self.update(request, *args, **kwargs)
+        return self.partial_update(request, *args, **kwargs)
 
 
 class RetrieveDestroyAPIView(mixins.RetrieveModelMixin,
@@ -248,8 +246,7 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
         return self.update(request, *args, **kwargs)
 
     def patch(self, request, *args, **kwargs):
-        kwargs['partial'] = True
-        return self.update(request, *args, **kwargs)
+        return self.partial_update(request, *args, **kwargs)
 
     def delete(self, request, *args, **kwargs):
         return self.destroy(request, *args, **kwargs)
-- 
cgit v1.2.3


From 099163f81f9d89746de50f3aed2955ead54dba4e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 18:45:15 +0100
Subject: Removed SingleObjectMixin and MultipleObjectMixin

---
 rest_framework/generics.py | 139 +++++++++++++++++++++++++++++++++------------
 1 file changed, 104 insertions(+), 35 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index dea980a5..af3b69da 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -4,21 +4,35 @@ Generic views that provide commonly needed behaviour.
 from __future__ import unicode_literals
 from rest_framework import views, mixins
 from rest_framework.settings import api_settings
-from django.views.generic.detail import SingleObjectMixin
-from django.views.generic.list import MultipleObjectMixin
-
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from django.core.paginator import Paginator, InvalidPage
+from django.http import Http404
+from django.utils.translation import ugettext as _
 
 ### Base classes for the generic views ###
 
+
 class GenericAPIView(views.APIView):
     """
     Base class for all other generic views.
     """
 
-    model = None
+    queryset = None
     serializer_class = None
-    model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS
+
     filter_backend = api_settings.FILTER_BACKEND
+    paginate_by = api_settings.PAGINATE_BY
+    paginate_by_param = api_settings.PAGINATE_BY_PARAM
+    pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS
+    allow_empty = True
+    page_kwarg = 'page'
+
+    # Pending deprecation
+    model = None
+    model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS
+    pk_url_kwarg = 'pk'  # Not provided in Django 1.3
+    slug_url_kwarg = 'slug'  # Not provided in Django 1.3
+    slug_field = 'slug'
 
     def filter_queryset(self, queryset):
         """
@@ -82,15 +96,7 @@ class GenericAPIView(views.APIView):
         """
         pass
 
-
-class MultipleObjectAPIView(MultipleObjectMixin, GenericAPIView):
-    """
-    Base class for generic views onto a queryset.
-    """
-
-    paginate_by = api_settings.PAGINATE_BY
-    paginate_by_param = api_settings.PAGINATE_BY_PARAM
-    pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS
+    # Pagination
 
     def get_pagination_serializer(self, page=None):
         """
@@ -116,28 +122,81 @@ class MultipleObjectAPIView(MultipleObjectMixin, GenericAPIView):
                 pass
         return self.paginate_by
 
-
-class SingleObjectAPIView(SingleObjectMixin, GenericAPIView):
-    """
-    Base class for generic views onto a model instance.
-    """
-
-    pk_url_kwarg = 'pk'  # Not provided in Django 1.3
-    slug_url_kwarg = 'slug'  # Not provided in Django 1.3
-    slug_field = 'slug'
+    def paginate_queryset(self, queryset, page_size, paginator_class=Paginator):
+        """
+        Paginate a queryset.
+        """
+        paginator = paginator_class(queryset, page_size, allow_empty_first_page=self.allow_empty)
+        page_kwarg = self.page_kwarg
+        page = self.kwargs.get(page_kwarg) or self.request.GET.get(page_kwarg) or 1
+        try:
+            page_number = int(page)
+        except ValueError:
+            if page == 'last':
+                page_number = paginator.num_pages
+            else:
+                raise Http404(_("Page is not 'last', nor can it be converted to an int."))
+        try:
+            page = paginator.page(page_number)
+            return (paginator, page, page.object_list, page.has_other_pages())
+        except InvalidPage as e:
+            raise Http404(_('Invalid page (%(page_number)s): %(message)s') % {
+                                'page_number': page_number,
+                                'message': str(e)
+            })
+
+    def get_queryset(self):
+        """
+        Get the list of items for this view. This must be an iterable, and may
+        be a queryset (in which qs-specific behavior will be enabled).
+        """
+        if self.queryset is not None:
+            queryset = self.queryset
+            if hasattr(queryset, '_clone'):
+                queryset = queryset._clone()
+        elif self.model is not None:
+            queryset = self.model._default_manager.all()
+        else:
+            raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'"
+                                       % self.__class__.__name__)
+        return queryset
 
     def get_object(self, queryset=None):
         """
-        Override default to add support for object-level permissions.
+        Returns the object the view is displaying.
+        By default this requires `self.queryset` and a `pk` or `slug` argument
+        in the URLconf, but subclasses can override this to return any object.
         """
-        obj = super(SingleObjectAPIView, self).get_object(queryset)
+        # Use a custom queryset if provided; this is required for subclasses
+        # like DateDetailView
+        if queryset is None:
+            queryset = self.get_queryset()
+        # Next, try looking up by primary key.
+        pk = self.kwargs.get(self.pk_url_kwarg, None)
+        slug = self.kwargs.get(self.slug_url_kwarg, None)
+        if pk is not None:
+            queryset = queryset.filter(pk=pk)
+        # Next, try looking up by slug.
+        elif slug is not None:
+            queryset = queryset.filter(**{self.slug_field: slug})
+        # If none of those are defined, it's an error.
+        else:
+            raise AttributeError("Generic detail view %s must be called with "
+                                 "either an object pk or a slug."
+                                 % self.__class__.__name__)
+        try:
+            # Get the single item from the filtered queryset
+            obj = queryset.get()
+        except ObjectDoesNotExist:
+            raise Http404(_("No %(verbose_name)s found matching the query") %
+                          {'verbose_name': queryset.model._meta.verbose_name})
+
         self.check_object_permissions(self.request, obj)
         return obj
 
 
 ### Concrete view classes that provide method handlers ###
-### by composing the mixin classes with a base view.   ###
-
+### by composing the mixin classes with the base view. ###
 
 class CreateAPIView(mixins.CreateModelMixin,
                     GenericAPIView):
@@ -150,7 +209,7 @@ class CreateAPIView(mixins.CreateModelMixin,
 
 
 class ListAPIView(mixins.ListModelMixin,
-                  MultipleObjectAPIView):
+                  GenericAPIView):
     """
     Concrete view for listing a queryset.
     """
@@ -159,7 +218,7 @@ class ListAPIView(mixins.ListModelMixin,
 
 
 class RetrieveAPIView(mixins.RetrieveModelMixin,
-                      SingleObjectAPIView):
+                      GenericAPIView):
     """
     Concrete view for retrieving a model instance.
     """
@@ -168,7 +227,7 @@ class RetrieveAPIView(mixins.RetrieveModelMixin,
 
 
 class DestroyAPIView(mixins.DestroyModelMixin,
-                     SingleObjectAPIView):
+                     GenericAPIView):
 
     """
     Concrete view for deleting a model instance.
@@ -178,7 +237,7 @@ class DestroyAPIView(mixins.DestroyModelMixin,
 
 
 class UpdateAPIView(mixins.UpdateModelMixin,
-                    SingleObjectAPIView):
+                    GenericAPIView):
 
     """
     Concrete view for updating a model instance.
@@ -192,7 +251,7 @@ class UpdateAPIView(mixins.UpdateModelMixin,
 
 class ListCreateAPIView(mixins.ListModelMixin,
                         mixins.CreateModelMixin,
-                        MultipleObjectAPIView):
+                        GenericAPIView):
     """
     Concrete view for listing a queryset or creating a model instance.
     """
@@ -205,7 +264,7 @@ class ListCreateAPIView(mixins.ListModelMixin,
 
 class RetrieveUpdateAPIView(mixins.RetrieveModelMixin,
                             mixins.UpdateModelMixin,
-                            SingleObjectAPIView):
+                            GenericAPIView):
     """
     Concrete view for retrieving, updating a model instance.
     """
@@ -221,7 +280,7 @@ class RetrieveUpdateAPIView(mixins.RetrieveModelMixin,
 
 class RetrieveDestroyAPIView(mixins.RetrieveModelMixin,
                              mixins.DestroyModelMixin,
-                             SingleObjectAPIView):
+                             GenericAPIView):
     """
     Concrete view for retrieving or deleting a model instance.
     """
@@ -235,7 +294,7 @@ class RetrieveDestroyAPIView(mixins.RetrieveModelMixin,
 class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
                                    mixins.UpdateModelMixin,
                                    mixins.DestroyModelMixin,
-                                   SingleObjectAPIView):
+                                   GenericAPIView):
     """
     Concrete view for retrieving, updating or deleting a model instance.
     """
@@ -250,3 +309,13 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
 
     def delete(self, request, *args, **kwargs):
         return self.destroy(request, *args, **kwargs)
+
+
+### Deprecated classes ###
+
+class MultipleObjectAPIView(GenericAPIView):
+    pass
+
+
+class SingleObjectAPIView(GenericAPIView):
+    pass
-- 
cgit v1.2.3


From dc45bc7bfad64a17f3e5ed0f5a487bccc379aac2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 19:01:01 +0100
Subject: Add lookup_kwarg

---
 rest_framework/generics.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index af3b69da..d4a50dcd 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -26,6 +26,7 @@ class GenericAPIView(views.APIView):
     pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS
     allow_empty = True
     page_kwarg = 'page'
+    lookup_kwarg = 'pk'
 
     # Pending deprecation
     model = None
@@ -167,23 +168,26 @@ class GenericAPIView(views.APIView):
         By default this requires `self.queryset` and a `pk` or `slug` argument
         in the URLconf, but subclasses can override this to return any object.
         """
-        # Use a custom queryset if provided; this is required for subclasses
-        # like DateDetailView
+        # Determine the base queryset to use.
         if queryset is None:
             queryset = self.get_queryset()
-        # Next, try looking up by primary key.
+
+        # Perform the lookup filtering.
         pk = self.kwargs.get(self.pk_url_kwarg, None)
         slug = self.kwargs.get(self.slug_url_kwarg, None)
-        if pk is not None:
+        lookup = self.kwargs.get(self.lookup_kwarg, None)
+
+        if lookup is not None:
+            queryset = queryset.filter(**{self.lookup_kwarg: lookup})
+        elif pk is not None:
             queryset = queryset.filter(pk=pk)
-        # Next, try looking up by slug.
         elif slug is not None:
             queryset = queryset.filter(**{self.slug_field: slug})
-        # If none of those are defined, it's an error.
         else:
             raise AttributeError("Generic detail view %s must be called with "
                                  "either an object pk or a slug."
                                  % self.__class__.__name__)
+
         try:
             # Get the single item from the filtered queryset
             obj = queryset.get()
@@ -191,7 +195,9 @@ class GenericAPIView(views.APIView):
             raise Http404(_("No %(verbose_name)s found matching the query") %
                           {'verbose_name': queryset.model._meta.verbose_name})
 
+        # May raise a permission denied
         self.check_object_permissions(self.request, obj)
+
         return obj
 
 
-- 
cgit v1.2.3


From 1de6cff11b71e4aaa7b76219d4d2118021e23a00 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 19:06:49 +0100
Subject: Cleaning up get_object and get_queryset

---
 rest_framework/generics.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index d4a50dcd..4ae2ac8e 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -148,25 +148,22 @@ class GenericAPIView(views.APIView):
 
     def get_queryset(self):
         """
-        Get the list of items for this view. This must be an iterable, and may
-        be a queryset (in which qs-specific behavior will be enabled).
+        Get the list of items for this view.
+
+        This must be an iterable, and may be a queryset.
         """
         if self.queryset is not None:
-            queryset = self.queryset
-            if hasattr(queryset, '_clone'):
-                queryset = queryset._clone()
-        elif self.model is not None:
-            queryset = self.model._default_manager.all()
-        else:
-            raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'"
-                                       % self.__class__.__name__)
-        return queryset
+            return self.queryset._clone()
+
+        if self.model is not None:
+            return self.model._default_manager.all()
+
+        raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'"
+                                    % self.__class__.__name__)
 
     def get_object(self, queryset=None):
         """
         Returns the object the view is displaying.
-        By default this requires `self.queryset` and a `pk` or `slug` argument
-        in the URLconf, but subclasses can override this to return any object.
         """
         # Determine the base queryset to use.
         if queryset is None:
-- 
cgit v1.2.3


From 9bb1277e512a88e6c11c52457d0c24e73f30bb98 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 19:37:19 +0100
Subject: Cleaning up around bits of API that will be pending deprecation

---
 rest_framework/generics.py | 116 +++++++++++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 46 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 4ae2ac8e..124dba38 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -35,15 +35,6 @@ class GenericAPIView(views.APIView):
     slug_url_kwarg = 'slug'  # Not provided in Django 1.3
     slug_field = 'slug'
 
-    def filter_queryset(self, queryset):
-        """
-        Given a queryset, filter it with whichever filter backend is in use.
-        """
-        if not self.filter_backend:
-            return queryset
-        backend = self.filter_backend()
-        return backend.filter_queryset(self.request, queryset, self)
-
     def get_serializer_context(self):
         """
         Extra context provided to the serializer class.
@@ -54,24 +45,6 @@ class GenericAPIView(views.APIView):
             'view': self
         }
 
-    def get_serializer_class(self):
-        """
-        Return the class to use for the serializer.
-
-        Defaults to using `self.serializer_class`, falls back to constructing a
-        model serializer class using `self.model_serializer_class`, with
-        `self.model` as the model.
-        """
-        serializer_class = self.serializer_class
-
-        if serializer_class is None:
-            class DefaultSerializer(self.model_serializer_class):
-                class Meta:
-                    model = self.model
-            serializer_class = DefaultSerializer
-
-        return serializer_class
-
     def get_serializer(self, instance=None, data=None,
                        files=None, many=False, partial=False):
         """
@@ -83,22 +56,6 @@ class GenericAPIView(views.APIView):
         return serializer_class(instance, data=data, files=files,
                                 many=many, partial=partial, context=context)
 
-    def pre_save(self, obj):
-        """
-        Placeholder method for calling before saving an object.
-        May be used eg. to set attributes on the object that are implicit
-        in either the request, or the url.
-        """
-        pass
-
-    def post_save(self, obj, created=False):
-        """
-        Placeholder method for calling after saving an object.
-        """
-        pass
-
-    # Pagination
-
     def get_pagination_serializer(self, page=None):
         """
         Return a serializer instance to use with paginated data.
@@ -111,9 +68,14 @@ class GenericAPIView(views.APIView):
         context = self.get_serializer_context()
         return pagination_serializer_class(instance=page, context=context)
 
-    def get_paginate_by(self, queryset):
+    def get_paginate_by(self, queryset=None):
         """
         Return the size of pages to use with pagination.
+
+        If `PAGINATE_BY_PARAM` is set it will attempt to get the page size
+        from a named query parameter in the url, eg. ?page_size=100
+
+        Otherwise defaults to using `self.paginate_by`.
         """
         if self.paginate_by_param:
             query_params = self.request.QUERY_PARAMS
@@ -121,6 +83,7 @@ class GenericAPIView(views.APIView):
                 return int(query_params[self.paginate_by_param])
             except (KeyError, ValueError):
                 pass
+
         return self.paginate_by
 
     def paginate_queryset(self, queryset, page_size, paginator_class=Paginator):
@@ -146,16 +109,54 @@ class GenericAPIView(views.APIView):
                                 'message': str(e)
             })
 
+    def filter_queryset(self, queryset):
+        """
+        Given a queryset, filter it with whichever filter backend is in use.
+        """
+        if not self.filter_backend:
+            return queryset
+        backend = self.filter_backend()
+        return backend.filter_queryset(self.request, queryset, self)
+
+    ### The following methods provide default implementations
+    ### that you may want to override for more complex cases.
+
+    def get_serializer_class(self):
+        """
+        Return the class to use for the serializer.
+        Defaults to using `self.serializer_class`.
+
+        You may want to override this if you need to provide different
+        serializations depending on the incoming request.
+
+        (Eg. admins get full serialization, others get basic serilization)
+        """
+        serializer_class = self.serializer_class
+        if serializer_class is not None:
+            return serializer_class
+
+        # TODO: Deprecation warning
+        class DefaultSerializer(self.model_serializer_class):
+            class Meta:
+                model = self.model
+        return DefaultSerializer
+
     def get_queryset(self):
         """
         Get the list of items for this view.
-
         This must be an iterable, and may be a queryset.
+        Defaults to using `self.queryset`.
+
+        You may want to override this if you need to provide different
+        querysets depending on the incoming request.
+
+        (Eg. return a list of items that is specific to the user)
         """
         if self.queryset is not None:
             return self.queryset._clone()
 
         if self.model is not None:
+            # TODO: Deprecation warning
             return self.model._default_manager.all()
 
         raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'"
@@ -164,10 +165,14 @@ class GenericAPIView(views.APIView):
     def get_object(self, queryset=None):
         """
         Returns the object the view is displaying.
+
+        You may want to override this if you need to provide non-standard
+        queryset lookups.  Eg if objects are referenced using multiple
+        keyword arguments in the url conf.
         """
         # Determine the base queryset to use.
         if queryset is None:
-            queryset = self.get_queryset()
+            queryset = self.filter_queryset(self.get_queryset())
 
         # Perform the lookup filtering.
         pk = self.kwargs.get(self.pk_url_kwarg, None)
@@ -177,8 +182,10 @@ class GenericAPIView(views.APIView):
         if lookup is not None:
             queryset = queryset.filter(**{self.lookup_kwarg: lookup})
         elif pk is not None:
+            # TODO: Deprecation warning
             queryset = queryset.filter(pk=pk)
         elif slug is not None:
+            # TODO: Deprecation warning
             queryset = queryset.filter(**{self.slug_field: slug})
         else:
             raise AttributeError("Generic detail view %s must be called with "
@@ -197,6 +204,23 @@ class GenericAPIView(views.APIView):
 
         return obj
 
+    ### The following methods are intended to be overridden.
+
+    def pre_save(self, obj):
+        """
+        Placeholder method for calling before saving an object.
+
+        May be used to set attributes on the object that are implicit
+        in either the request, or the url.
+        """
+        pass
+
+    def post_save(self, obj, created=False):
+        """
+        Placeholder method for calling after saving an object.
+        """
+        pass
+
 
 ### Concrete view classes that provide method handlers ###
 ### by composing the mixin classes with the base view. ###
-- 
cgit v1.2.3


From 07af4373616c28e7600ee2ec7981b5a1d0a92f7d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 19:47:16 +0100
Subject: Cleaning up around bits of API that will be pending deprecation

---
 rest_framework/generics.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 124dba38..ba7d1f43 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -24,15 +24,17 @@ class GenericAPIView(views.APIView):
     paginate_by = api_settings.PAGINATE_BY
     paginate_by_param = api_settings.PAGINATE_BY_PARAM
     pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS
-    allow_empty = True
     page_kwarg = 'page'
     lookup_kwarg = 'pk'
+    allow_empty = True
+
+    ######################################
+    # These are all pending deprecation...
 
-    # Pending deprecation
     model = None
     model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS
-    pk_url_kwarg = 'pk'  # Not provided in Django 1.3
-    slug_url_kwarg = 'slug'  # Not provided in Django 1.3
+    pk_url_kwarg = 'pk'
+    slug_url_kwarg = 'slug'
     slug_field = 'slug'
 
     def get_serializer_context(self):
@@ -90,7 +92,8 @@ class GenericAPIView(views.APIView):
         """
         Paginate a queryset.
         """
-        paginator = paginator_class(queryset, page_size, allow_empty_first_page=self.allow_empty)
+        paginator = paginator_class(queryset, page_size,
+                                    allow_empty_first_page=self.allow_empty)
         page_kwarg = self.page_kwarg
         page = self.kwargs.get(page_kwarg) or self.request.GET.get(page_kwarg) or 1
         try:
@@ -118,6 +121,7 @@ class GenericAPIView(views.APIView):
         backend = self.filter_backend()
         return backend.filter_queryset(self.request, queryset, self)
 
+    ########################
     ### The following methods provide default implementations
     ### that you may want to override for more complex cases.
 
@@ -204,7 +208,9 @@ class GenericAPIView(views.APIView):
 
         return obj
 
-    ### The following methods are intended to be overridden.
+    ########################
+    ### The following are placeholder methods,
+    ### and are intended to be overridden.
 
     def pre_save(self, obj):
         """
@@ -222,8 +228,10 @@ class GenericAPIView(views.APIView):
         pass
 
 
+##########################################################
 ### Concrete view classes that provide method handlers ###
 ### by composing the mixin classes with the base view. ###
+##########################################################
 
 class CreateAPIView(mixins.CreateModelMixin,
                     GenericAPIView):
@@ -338,7 +346,9 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
         return self.destroy(request, *args, **kwargs)
 
 
+##########################
 ### Deprecated classes ###
+##########################
 
 class MultipleObjectAPIView(GenericAPIView):
     pass
-- 
cgit v1.2.3


From e0020c5b033308cd789408a8823d6707deed8032 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 11 Apr 2013 15:48:18 +0100
Subject: Simplify get_object

---
 rest_framework/generics.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'rest_framework/generics.py')

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index ba7d1f43..ea62123d 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -4,9 +4,10 @@ Generic views that provide commonly needed behaviour.
 from __future__ import unicode_literals
 from rest_framework import views, mixins
 from rest_framework.settings import api_settings
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from django.core.exceptions import ImproperlyConfigured
 from django.core.paginator import Paginator, InvalidPage
 from django.http import Http404
+from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext as _
 
 ### Base classes for the generic views ###
@@ -163,7 +164,7 @@ class GenericAPIView(views.APIView):
             # TODO: Deprecation warning
             return self.model._default_manager.all()
 
-        raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'"
+        raise ImproperlyConfigured("'%s' must define 'queryset'"
                                     % self.__class__.__name__)
 
     def get_object(self, queryset=None):
@@ -177,6 +178,8 @@ class GenericAPIView(views.APIView):
         # Determine the base queryset to use.
         if queryset is None:
             queryset = self.filter_queryset(self.get_queryset())
+        else:
+            pass  # Deprecation warning
 
         # Perform the lookup filtering.
         pk = self.kwargs.get(self.pk_url_kwarg, None)
@@ -184,24 +187,19 @@ class GenericAPIView(views.APIView):
         lookup = self.kwargs.get(self.lookup_kwarg, None)
 
         if lookup is not None:
-            queryset = queryset.filter(**{self.lookup_kwarg: lookup})
+            filter_kwargs = {self.lookup_kwarg: lookup}
         elif pk is not None:
             # TODO: Deprecation warning
-            queryset = queryset.filter(pk=pk)
+            filter_kwargs = {'pk': pk}
         elif slug is not None:
             # TODO: Deprecation warning
-            queryset = queryset.filter(**{self.slug_field: slug})
+            filter_kwargs = {self.slug_field: slug}
         else:
             raise AttributeError("Generic detail view %s must be called with "
                                  "either an object pk or a slug."
                                  % self.__class__.__name__)
 
-        try:
-            # Get the single item from the filtered queryset
-            obj = queryset.get()
-        except ObjectDoesNotExist:
-            raise Http404(_("No %(verbose_name)s found matching the query") %
-                          {'verbose_name': queryset.model._meta.verbose_name})
+        obj = get_object_or_404(queryset, **filter_kwargs)
 
         # May raise a permission denied
         self.check_object_permissions(self.request, obj)
-- 
cgit v1.2.3