diff options
Diffstat (limited to 'django/http/__init__.py')
| -rw-r--r-- | django/http/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py index 834c3e625e..b5af9b6e6a 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -271,9 +271,7 @@ class HttpResponse(object): self.cookies[key]['max-age'] = 0 def _get_content(self): - content = ''.join(self._container) - if isinstance(content, unicode): - content = content.encode(self._charset) + content = smart_str(''.join(self._container), self._charset) return content def _set_content(self, value): |