summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2007-02-10 03:56:21 +0000
committerAdrian Holovaty <adrian@holovaty.com>2007-02-10 03:56:21 +0000
commitae36e6303df82656a8bdee4501b50d20537a9c53 (patch)
tree4b20db43e8b8381882327877a6fd08b98cbc1930
parent45e0a522bbd3d2a947e5a77f767b8836c9327985 (diff)
Fixed #3437 -- Fixed incorrect logic in django.http.HttpResponse calculation of _is_string. Thanks, Brian Harring
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-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: