encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 12:30:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2f990e8932 into 0e341c24b4

Browse Source
This commit is contained in:
Mike 2017-09-09 10:25:42 +00:00 committed by GitHub
commit 076d83ac06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/response.py
View File

@ -19,7 +19,7 @@ class Response(SimpleTemplateResponse):
arbitrary media types.
"""
def __init__(self, data=None, status=None,
def __init__(self, data=None, status=None, renderer=None,
template_name=None, headers=None,
exception=False, content_type=None):
"""
@ -43,6 +43,7 @@ class Response(SimpleTemplateResponse):
self.template_name = template_name
self.exception = exception
self.content_type = content_type
self.renderer = renderer
if headers:
for name, value in six.iteritems(headers):
@ -50,7 +51,7 @@ class Response(SimpleTemplateResponse):
@property
def rendered_content(self):
renderer = getattr(self, 'accepted_renderer', None)
renderer = getattr(self, 'accepted_renderer', self.renderer)
accepted_media_type = getattr(self, 'accepted_media_type', None)
context = getattr(self, 'renderer_context', None)