summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 48f10329fd..a6538b7d4a 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -160,7 +160,7 @@ class HttpResponse(object):
self._charset = settings.DEFAULT_CHARSET
if not mimetype:
mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
- if hasattr(content, '__iter__'):
+ if not isinstance(content, basestring) and hasattr(content, '__iter__'):
self._container = content
self._is_string = False
else: