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

Merge 1a0bec8bdc into 151a60b64b

Browse Source
This commit is contained in:
st8st8 2016-06-27 13:08:28 +00:00 committed by GitHub
commit 33df9e5e5f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/response.py
View File

@ -62,12 +62,6 @@ class Response(SimpleTemplateResponse):
charset = renderer.charset
content_type = self.content_type
if content_type is None and charset is not None:
content_type = "{0}; charset={1}".format(media_type, charset)
elif content_type is None:
content_type = media_type
self['Content-Type'] = content_type
ret = renderer.render(self.data, media_type, context)
if isinstance(ret, six.text_type):
assert charset, (
@ -76,6 +70,15 @@ class Response(SimpleTemplateResponse):
)
return bytes(ret.encode(charset))
boundary = renderer.boundary if hasattr(renderer, "boundary") else None
if not content_type:
content_type = "{0}".format(media_type)
if charset is not None:
content_type += "; charset={0}".format(charset)
if boundary is not None:
content_type += "; boundary={0}".format(boundary)
self['Content-Type'] = content_type
if not ret:
del self['Content-Type']