Merge pull request #282 from tomchristie/html-template-responses

Html template responses

1 files changed, 12 insertions, 17 deletions

diff --git a/rest_framework/response.py b/rest_framework/response.py
index db6bf3e2..9a633a8a 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -8,8 +8,8 @@ class Response(SimpleTemplateResponse):
     arbitrary media types.
     """
 
-    def __init__(self, data=None, status=None, headers=None,
-                 renderer=None, accepted_media_type=None):
+    def __init__(self, data=None, status=200,
+                 template_name=None, headers=None):
         """
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
@@ -20,26 +20,21 @@ class Response(SimpleTemplateResponse):
         super(Response, self).__init__(None, status=status)
         self.data = data
         self.headers = headers and headers[:] or []
-        self.renderer = renderer
-
-        # Accepted media type is the portion of the request Accept header
-        # that the renderer satisfied.  It could be '*/*', or somthing like
-        # application/json; indent=4
-        #
-        # This is NOT the value that will be returned in the 'Content-Type'
-        # header, but we do need to know the value in case there are
-        # any specific parameters which affect the rendering process.
-        self.accepted_media_type = accepted_media_type
+        self.template_name = template_name
 
     @property
     def rendered_content(self):
-        assert self.renderer, "No renderer set on Response"
+        renderer = self.accepted_renderer
+        media_type = self.accepted_media_type
+
+        assert renderer, "No accepted renderer set on Response"
+        assert media_type, "No accepted media type set on Response"
 
-        self['Content-Type'] = self.renderer.media_type
+        self['Content-Type'] = media_type
         if self.data is None:
-            return self.renderer.render()
-        render_media_type = self.accepted_media_type or self.renderer.media_type
-        return self.renderer.render(self.data, render_media_type)
+            return renderer.render()
+
+        return renderer.render(self.data, media_type)
 
     @property
     def status_text(self):