aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/views.py
diff options
context:
space:
mode:
authorTom Christie2012-10-17 22:58:18 +0100
committerTom Christie2012-10-17 22:58:18 +0100
commite126b615420fed12af58675cb4bb52e749b006bd (patch)
tree4284ae586c094557153371c1dfd483906e6056b0 /rest_framework/views.py
parentbbd3728da615f688da6a5276c6a898990275f32c (diff)
downloaddjango-rest-framework-e126b615420fed12af58675cb4bb52e749b006bd.tar.bz2
Negotiation API finalized. .select_renderers and .select_parsers
Diffstat (limited to 'rest_framework/views.py')
-rw-r--r--rest_framework/views.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/rest_framework/views.py b/rest_framework/views.py
index 066c0bb9..357d8939 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -238,7 +238,13 @@ class APIView(View):
"""
renderers = self.get_renderers()
conneg = self.get_content_negotiator()
- return conneg.negotiate(request, renderers, self.format_kwarg, force)
+
+ try:
+ return conneg.select_renderer(request, renderers, self.format_kwarg)
+ except:
+ if force:
+ return (renderers[0], renderers[0].media_type)
+ raise
def has_permission(self, request, obj=None):
"""