diff options
| author | Tom Christie | 2014-08-29 16:46:26 +0100 | 
|---|---|---|
| committer | Tom Christie | 2014-08-29 16:46:26 +0100 | 
| commit | 4ac4676a40b121d27cfd1173ff548d96b8d3de2f (patch) | |
| tree | 560509db11316a36189088dd8b03df4126a696cd /rest_framework/generics.py | |
| parent | 371d30aa8737c4b3aaf28ee10cc2b77a9c4d1fd9 (diff) | |
| download | django-rest-framework-4ac4676a40b121d27cfd1173ff548d96b8d3de2f.tar.bz2 | |
First pass
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 10 | 
1 files changed, 4 insertions, 6 deletions
| diff --git a/rest_framework/generics.py b/rest_framework/generics.py index b3bd6ce9..6705cbb2 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -79,18 +79,16 @@ class GenericAPIView(views.APIView):              'view': self          } -    def get_serializer(self, instance=None, data=None, files=None, many=False, -                       partial=False, allow_add_remove=False): +    def get_serializer(self, instance=None, data=None, many=False, partial=False):          """          Return the serializer instance that should be used for validating and          deserializing input, and for serializing output.          """          serializer_class = self.get_serializer_class()          context = self.get_serializer_context() -        return serializer_class(instance, data=data, files=files, -                                many=many, partial=partial, -                                allow_add_remove=allow_add_remove, -                                context=context) +        return serializer_class( +            instance, data=data, many=many, partial=partial, context=context +        )      def get_pagination_serializer(self, page):          """ | 
