diff options
Diffstat (limited to 'django/http')
| -rw-r--r-- | django/http/response.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/django/http/response.py b/django/http/response.py index 94d14ddb54..da9f9ef6a6 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -316,13 +316,16 @@ class HttpResponse(HttpResponseBase): def content(self, value): # Consume iterators upon assignment to allow repeated iteration. if hasattr(value, '__iter__') and not isinstance(value, (bytes, six.string_types)): + content = b''.join(self.make_bytes(chunk) for chunk in value) if hasattr(value, 'close'): - self._closable_objects.append(value) - value = b''.join(self.make_bytes(chunk) for chunk in value) + try: + value.close() + except Exception: + pass else: - value = self.make_bytes(value) + content = self.make_bytes(value) # Create a list of properly encoded bytestrings to support write(). - self._container = [value] + self._container = [content] def __iter__(self): return iter(self._container) |