diff options
| author | Xavier Ordoquy | 2014-10-08 08:33:28 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-10-08 08:33:28 +0200 |
| commit | 311d315a739f4d1d02e87a09de0bbf9e7b0cee46 (patch) | |
| tree | 79f3a875f7cb7caef77f2d708593f8070bbca828 | |
| parent | b3af4d9fe74619b76ef250294999240ab15cd634 (diff) | |
| download | django-rest-framework-311d315a739f4d1d02e87a09de0bbf9e7b0cee46.tar.bz2 | |
Reverted 59d0a0387d907260ef8f91bbbca618831abd75a3 and fixed the tests
| -rw-r--r-- | rest_framework/response.py | 4 | ||||
| -rw-r--r-- | tests/test_renderers.py | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/rest_framework/response.py b/rest_framework/response.py index 0a7d313f..d6ca1aad 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 91244e26..b922ec29 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: |