From d7799c32c8b5da2e9267c49bc78bc7fe4703ecfe Mon Sep 17 00:00:00 2001 From: disturbedmime Date: Sat, 3 Oct 2015 14:07:36 -0700 Subject: [PATCH] Changing signature for get_object() within GenericAPIView to match with Django's SingleObjectMixin's signature for get_object() by adding a kwarg for queryset. --- rest_framework/generics.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 88438e8c4..1bd7d2357 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -73,7 +73,7 @@ class GenericAPIView(views.APIView): queryset = queryset.all() return queryset - def get_object(self): + def get_object(self, queryset=None): """ Returns the object the view is displaying. @@ -81,7 +81,10 @@ class GenericAPIView(views.APIView): queryset lookups. Eg if objects are referenced using multiple keyword arguments in the url conf. """ - queryset = self.filter_queryset(self.get_queryset()) + if queryset is not None: + queryset = self.filter_queryset(queryset) + else: + queryset = self.filter_queryset(self.get_queryset()) # Perform the lookup filtering. lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field