diff options
| author | Mark Aaron Shirley | 2013-04-16 09:55:47 -0700 |
|---|---|---|
| committer | Mark Aaron Shirley | 2013-04-16 09:55:47 -0700 |
| commit | c7e000e46e831a254689faac44ea44ebafe3cd61 (patch) | |
| tree | f3b3ed8c258b82b3dfb1939404f00f5fb16b7c1c /rest_framework/mixins.py | |
| parent | bda25479aa7e73c90bc77b7c7219eaa411af138e (diff) | |
| parent | 23289b023db230f73e4a5bfae24a56c79e3fcd4b (diff) | |
| download | django-rest-framework-c7e000e46e831a254689faac44ea44ebafe3cd61.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts:
docs/api-guide/serializers.md
Diffstat (limited to 'rest_framework/mixins.py')
| -rw-r--r-- | rest_framework/mixins.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 7d9a6e65..3bd7d6df 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -97,9 +97,7 @@ class RetrieveModelMixin(object): Should be mixed in with `SingleObjectAPIView`. """ def retrieve(self, request, *args, **kwargs): - queryset = self.get_queryset() - filtered_queryset = self.filter_queryset(queryset) - self.object = self.get_object(filtered_queryset) + self.object = self.get_object() serializer = self.get_serializer(self.object) return Response(serializer.data) |