diff options
| author | Tom Christie | 2012-11-16 14:48:42 -0800 |
|---|---|---|
| committer | Tom Christie | 2012-11-16 14:48:42 -0800 |
| commit | e40000c834b7476fe684720bf54abda7ca1c4c06 (patch) | |
| tree | 4a2cdc2796c4e088cc1e3ddd5f31ded1d3682a32 /rest_framework/generics.py | |
| parent | 31f01bd6315f46bf28bb4c9c25a5298785fc4fc6 (diff) | |
| parent | f801e5d3050591403de04fde7d18522fabc8fe49 (diff) | |
| download | django-rest-framework-e40000c834b7476fe684720bf54abda7ca1c4c06.tar.bz2 | |
Merge pull request #408 from markotibold/file_and_image_fields
Added a FileField and an ImageField
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index dcf4dfd9..be225d0a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -47,11 +47,10 @@ class GenericAPIView(views.APIView): return serializer_class 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() context = self.get_serializer_context() - return serializer_class(instance, data=data, context=context) + return serializer_class(instance, data=data, files=files, context=context) class MultipleObjectAPIView(MultipleObjectMixin, GenericAPIView): |