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

This commit is contained in:
Tom Christie 2016-07-11 13:49:21 +01:00
commit 7bfa5a9141

View File

@ -51,14 +51,13 @@ class Response(SimpleTemplateResponse):
@property @property
def rendered_content(self): def rendered_content(self):
renderer = getattr(self, 'accepted_renderer', None) renderer = getattr(self, 'accepted_renderer', None)
media_type = getattr(self, 'accepted_media_type', None)
context = getattr(self, 'renderer_context', None) context = getattr(self, 'renderer_context', None)
assert renderer, ".accepted_renderer not set on Response" assert renderer, ".accepted_renderer not set on Response"
assert media_type, ".accepted_media_type not set on Response"
assert context, ".renderer_context not set on Response" assert context, ".renderer_context not set on Response"
context['response'] = self context['response'] = self
media_type = renderer.media_type
charset = renderer.charset charset = renderer.charset
content_type = self.content_type content_type = self.content_type