diff options
| -rw-r--r-- | rest_framework/generics.py | 2 | ||||
| -rw-r--r-- | rest_framework/mixins.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7675d7f9..45cedd8b 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -43,7 +43,7 @@ class GenericAPIView(views.APIView): return serializer_class - def get_serializer(self, data=None, files=None, instance=None): + def get_serializer(self, instance=None, data=None, files=None): # TODO: add support for files # TODO: add support for seperate serializer/deserializer serializer_class = self.get_serializer_class() diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 47e4edf7..6824a4d2 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -51,7 +51,7 @@ class ListModelMixin(object): paginator, page, queryset, is_paginated = packed serializer = self.get_pagination_serializer(page) else: - serializer = self.get_serializer(instance=self.object_list) + serializer = self.get_serializer(self.object_list) return Response(serializer.data) @@ -63,7 +63,7 @@ class RetrieveModelMixin(object): """ def retrieve(self, request, *args, **kwargs): self.object = self.get_object() - serializer = self.get_serializer(instance=self.object) + serializer = self.get_serializer(self.object) return Response(serializer.data) @@ -80,7 +80,7 @@ class UpdateModelMixin(object): self.object = None success_status = status.HTTP_201_CREATED - serializer = self.get_serializer(data=request.DATA, instance=self.object) + serializer = self.get_serializer(self.object, data=request.DATA) if serializer.is_valid(): self.pre_save(serializer.object) |