diff options
| author | Tom Christie | 2014-11-28 15:01:56 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-28 15:01:56 +0000 |
| commit | 8d989bb16dcc2f035ccc42710ca2714912a2ec40 (patch) | |
| tree | 1204160a65aa3bd6f4a2168e1e598ba5db8a5200 | |
| parent | 9ba29a88d6674d65bf5e8438eba2a072f0d44bf1 (diff) | |
| parent | 767414439b5553d6cb4e1825b39ff7de65d39a35 (diff) | |
| download | django-rest-framework-8d989bb16dcc2f035ccc42710ca2714912a2ec40.tar.bz2 | |
Merge pull request #2143 from linovia/bugfix/1850
Bugfix for #1850
| -rw-r--r-- | rest_framework/response.py | 4 | ||||
| -rw-r--r-- | tests/test_renderers.py | 1 |
2 files changed, 1 insertions, 4 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 5ef65dd7..416d7f22 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -646,6 +646,7 @@ class CacheRenderTest(TestCase): """ method = getattr(self.client, http_method) resp = method(url) + resp._closable_objects = [] del resp.client, resp.request try: del resp.wsgi_request |
