From 26c7d6df6c0a12a2e19e07951b93de80bbfdf91c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 5 Oct 2012 12:13:44 +0100
Subject: HTMLTemplateRenderer working

---
 rest_framework/response.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'rest_framework/response.py')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index fca631c3..796750fc 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=None,
+                 template_name=None, headers=None):
         """
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
@@ -20,21 +20,21 @@ class Response(SimpleTemplateResponse):
         super(Response, self).__init__(None, status=status)
         self.data = data
         self.headers = headers and headers[:] or []
-
-        self.accepted_renderer = renderer
-        self.accepted_media_type = accepted_media_type
+        self.template_name = template_name
 
     @property
     def rendered_content(self):
         renderer = self.accepted_renderer
+        media_type = self.accepted_media_type
 
-        assert renderer, "No renderer set on Response"
+        assert renderer, "No accepted renderer set on Response"
+        assert media_type, "No accepted media type set on Response"
 
-        self['content-type'] = self.accepted_media_type
+        self['content-type'] = media_type
         if self.data is None:
             return renderer.render()
 
-        return renderer.render(self.data, self.accepted_media_type)
+        return renderer.render(self.data, media_type)
 
     @property
     def status_text(self):
-- 
cgit v1.2.3