From 963c5fe4a702f906576ae66e2c4c3193896fcd38 Mon Sep 17 00:00:00 2001
From: Jacob Magnusson
Date: Sun, 4 Nov 2012 12:48:41 +0100
Subject: Remove attributes that are not needed when caching the Response
 object. This fixes #346

---
 rest_framework/response.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'rest_framework/response.py')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 7a459c8f..006d7eeb 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -45,3 +45,13 @@ class Response(SimpleTemplateResponse):
         # TODO: Deprecate and use a template tag instead
         # TODO: Status code text for RFC 6585 status codes
         return STATUS_CODE_TEXT.get(self.status_code, '')
+
+    def __getstate__(self):
+        """
+        Remove attributes from the response that shouldn't be cached
+        """
+        state = super(Response, self).__getstate__()
+        for key in ('accepted_renderer', 'renderer_context', 'data'):
+            if key in state:
+                del state[key]
+        return state
-- 
cgit v1.2.3


From b19c58ae17ee54a3a8d193608660d96fd52f83f0 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 6 Nov 2012 10:44:19 +0000
Subject: Support for HTML error templates.  Fixes #319.

---
 rest_framework/response.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'rest_framework/response.py')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 006d7eeb..0de01204 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -9,7 +9,8 @@ class Response(SimpleTemplateResponse):
     """
 
     def __init__(self, data=None, status=200,
-                 template_name=None, headers=None):
+                 template_name=None, headers=None,
+                 exception=False):
         """
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
@@ -21,6 +22,7 @@ class Response(SimpleTemplateResponse):
         self.data = data
         self.headers = headers and headers[:] or []
         self.template_name = template_name
+        self.exception = exception
 
     @property
     def rendered_content(self):
-- 
cgit v1.2.3


From 573de11b233a85347456a4d7e50fd7345d13db03 Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Tue, 13 Nov 2012 18:07:38 +0100
Subject: changed buggy response + code ploishing

reponse didnt handle any headers at all. Accepts now a dict of headers
and sets those properly
---
 rest_framework/response.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'rest_framework/response.py')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 0de01204..88f0019f 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -20,9 +20,12 @@ class Response(SimpleTemplateResponse):
         """
         super(Response, self).__init__(None, status=status)
         self.data = data
-        self.headers = headers and headers[:] or []
         self.template_name = template_name
         self.exception = exception
+        
+        if headers:
+            for name,value in headers.iteritems():
+                self[name] = value
 
     @property
     def rendered_content(self):
-- 
cgit v1.2.3


From 44ff2e0add240915d3217ba418178e58e2920419 Mon Sep 17 00:00:00 2001
From: Stephan Groß
Date: Wed, 14 Nov 2012 19:36:29 +0100
Subject: fixed some typos

---
 rest_framework/response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/response.py')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 0de01204..0bd6c65d 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -15,7 +15,7 @@ class Response(SimpleTemplateResponse):
         Alters the init arguments slightly.
         For example, drop 'template_name', and instead use 'data'.
 
-        Setting 'renderer' and 'media_type' will typically be defered,
+        Setting 'renderer' and 'media_type' will typically be deferred,
         For example being set automatically by the `APIView`.
         """
         super(Response, self).__init__(None, status=status)
-- 
cgit v1.2.3