summaryrefslogtreecommitdiff
path: root/django/http
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-05 09:28:56 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-05 09:28:56 +0000
commit01ca12277401d5bc0b42d67cd6bf2292f7e1ec95 (patch)
treee2d28ce11d633bbcdeab00a3793e79a84cf7a748 /django/http
parent86c417077d44b4b59afda8629a53f48f78850b50 (diff)
Fixed #6063 -- Caught one place in HttpResponse that was not returning a str
type (violation of WSGI spec). Thanks, janusz.harkot@gmail.com. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http')
-rw-r--r--django/http/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py
index 47f9736ce2..13cc8cea0d 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -331,7 +331,7 @@ class HttpResponse(object):
chunk = self._iterator.next()
if isinstance(chunk, unicode):
chunk = chunk.encode(self._charset)
- return chunk
+ return str(chunk)
def close(self):
if hasattr(self._container, 'close'):