Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #1569 -- Made streaming HttpResponse unicode-aware

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 63e7f205952f6759774fc1e3caaaa28a56ae9da8 1 parent a0485f5
@adrianholovaty adrianholovaty authored
Showing with 15 additions and 6 deletions.
  1. +15 −6 django/utils/httpwrappers.py
View
21 django/utils/httpwrappers.py
@@ -151,10 +151,10 @@ def __init__(self, content='', mimetype=None):
if not mimetype:
mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
if hasattr(content, '__iter__'):
- self.iterator = content
+ self._iterator = content
self._is_string = False
else:
- self.iterator = [content]
+ self._iterator = [content]
self._is_string = True
self.headers = {'Content-Type': mimetype}
self.cookies = SimpleCookie()
@@ -200,23 +200,32 @@ def delete_cookie(self, key):
pass
def _get_content(self):
- content = ''.join(self.iterator)
+ content = ''.join(self._iterator)
if isinstance(content, unicode):
content = content.encode(self._charset)
return content
def _set_content(self, value):
- self.iterator = [value]
+ self._iterator = [value]
self._is_string = True
content = property(_get_content, _set_content)
+ def _get_iterator(self):
+ "Output iterator. Converts data into client charset if necessary."
+ for chunk in self._iterator:
+ if isinstance(chunk, unicode):
+ chunk = chunk.encode(self._charset)
+ yield chunk
+
+ iterator = property(_get_iterator)
+
# The remaining methods partially implement the file-like object interface.
# See http://docs.python.org/lib/bltin-file-objects.html
def write(self, content):
if not self._is_string:
raise Exception, "This %s instance is not writable" % self.__class__
- self.iterator.append(content)
+ self._iterator.append(content)
def flush(self):
pass
@@ -224,7 +233,7 @@ def flush(self):
def tell(self):
if not self._is_string:
raise Exception, "This %s instance cannot tell its position" % self.__class__
- return sum([len(chunk) for chunk in self.iterator])
+ return sum([len(chunk) for chunk in self._iterator])
class HttpResponseRedirect(HttpResponse):
def __init__(self, redirect_to):
Please sign in to comment.
Something went wrong with that request. Please try again.