From e126b615420fed12af58675cb4bb52e749b006bd Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 17 Oct 2012 22:58:18 +0100
Subject: Negotiation API finalized.  .select_renderers and .select_parsers

---
 rest_framework/views.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'rest_framework/views.py')

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):
         """
-- 
cgit v1.2.3