aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/negotiation.py
diff options
context:
space:
mode:
authorTom Christie2013-05-18 17:21:43 +0100
committerTom Christie2013-05-18 17:21:43 +0100
commit0d3d66cb0232e1067600ef22fcf88937ac6bee9d (patch)
treee39f1750d919026607ba2d99610207e5fecb2e37 /rest_framework/negotiation.py
parent5bebd29f11dd9268b9a23c27cf58c8440664f5e9 (diff)
downloaddjango-rest-framework-0d3d66cb0232e1067600ef22fcf88937ac6bee9d.tar.bz2
Added proper charset support
Diffstat (limited to 'rest_framework/negotiation.py')
-rw-r--r--rest_framework/negotiation.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py
index 668c4e5c..4d205c0e 100644
--- a/rest_framework/negotiation.py
+++ b/rest_framework/negotiation.py
@@ -58,17 +58,11 @@ class DefaultContentNegotiation(BaseContentNegotiation):
_MediaType(media_type).precedence):
# Eg client requests '*/*'
# Accepted media type is 'application/json'
- renderer_and_media_type = renderer, renderer.media_type
+ return renderer, renderer.media_type
else:
# Eg client requests 'application/json; indent=8'
# Accepted media type is 'application/json; indent=8'
- renderer_and_media_type = renderer, media_type
- if renderer.charset:
- charset = renderer.charset
- else:
- charset = self.__class__.settings.DEFAULT_CHARSET
- retval = renderer_and_media_type + (charset,)
- return retval
+ return renderer, media_type
raise exceptions.NotAcceptable(available_renderers=renderers)