encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-09-21 03:19:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use saner get_serializer signature

Browse Source
This commit is contained in:
Tom Christie 2012-11-06 17:04:48 +00:00
parent 12b86cb5e3
commit cedb3860f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/generics.py
View File

@ -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()

6
rest_framework/mixins.py
View File

@ -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)