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

Merge branch 'master' of github.com:tomchristie/django-rest-framework

Browse Source
This commit is contained in:
Tom Christie 2015-08-11 09:24:16 +01:00
commit b7e47e3d67
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/response.py
View File

@ -10,6 +10,8 @@ from django.template.response import SimpleTemplateResponse
from django.utils import six from django.utils import six
from django.utils.six.moves.http_client import responses from django.utils.six.moves.http_client import responses
from rest_framework.serializers import Serializer
class Response(SimpleTemplateResponse): class Response(SimpleTemplateResponse):
""" """
@ -28,6 +30,15 @@ class Response(SimpleTemplateResponse):
For example being set automatically by the `APIView`. For example being set automatically by the `APIView`.
""" """
super(Response, self).__init__(None, status=status) super(Response, self).__init__(None, status=status)
if isinstance(data, Serializer):
msg = (
'You passed a Serializer instance as data, but '
'probably meant to pass serialized `.data` or '
'`.error`. representation.'
)
raise AssertionError(msg)
self.data = data self.data = data
self.template_name = template_name self.template_name = template_name
self.exception = exception self.exception = exception