aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/generics.py
diff options
context:
space:
mode:
authorMarko Tibold2012-11-13 23:26:17 +0100
committerMarko Tibold2012-11-13 23:26:17 +0100
commit5443dd5f3c5f75cd1524eb26c6d5b53df3594f9b (patch)
tree90b6338de44f12090a21315b82f008c2137f9759 /rest_framework/generics.py
parent44e9749e36d31f811db7dc0998c7b8d1e35a784d (diff)
downloaddjango-rest-framework-5443dd5f3c5f75cd1524eb26c6d5b53df3594f9b.tar.bz2
Added a FileField and an ImageField (copied from django.forms.fields).
Adjusted generics, mixins and serializers to take a `files` arg where applicable.
Diffstat (limited to 'rest_framework/generics.py')
-rw-r--r--rest_framework/generics.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index ebd06e45..d47c39cd 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -44,11 +44,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):