From 311d315a739f4d1d02e87a09de0bbf9e7b0cee46 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Wed, 8 Oct 2014 08:33:28 +0200
Subject: [PATCH 1/2] Reverted 59d0a0387d907260ef8f91bbbca618831abd75a3 and
 fixed the tests

---
 rest_framework/response.py | 4 ----
 tests/test_renderers.py    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/rest_framework/response.py b/rest_framework/response.py
index 0a7d313f4..d6ca1aad4 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -5,7 +5,6 @@ it is initialized with unrendered data, instead of a pre-rendered string.
 The appropriate renderer is called during Django's template response rendering.
 """
 from __future__ import unicode_literals
-import django
 from django.core.handlers.wsgi import STATUS_CODE_TEXT
 from django.template.response import SimpleTemplateResponse
 from django.utils import six
@@ -16,9 +15,6 @@ class Response(SimpleTemplateResponse):
     An HttpResponse that allows its data to be rendered into
     arbitrary media types.
     """
-    # TODO: remove that once Django 1.3 isn't supported
-    if django.VERSION >= (1, 4):
-        rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects']
 
     def __init__(self, data=None, status=None,
                  template_name=None, headers=None,
diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index 91244e261..b922ec291 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -643,7 +643,7 @@ class CacheRenderTest(TestCase):
         """
         method = getattr(self.client, http_method)
         resp = method(url)
-        del resp.client, resp.request
+        del resp.client, resp.request, resp._closable_objects
         try:
             del resp.wsgi_request
         except AttributeError:

From 767414439b5553d6cb4e1825b39ff7de65d39a35 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Wed, 26 Nov 2014 22:20:14 +0100
Subject: [PATCH 2/2] Be nicer with __closable_objects.

---
 tests/test_renderers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index a842babaa..416d7f224 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -646,7 +646,8 @@ class CacheRenderTest(TestCase):
         """
         method = getattr(self.client, http_method)
         resp = method(url)
-        del resp.client, resp.request, resp._closable_objects
+        resp._closable_objects = []
+        del resp.client, resp.request
         try:
             del resp.wsgi_request
         except AttributeError: