test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #1569 -- Made streaming HttpResponse unicode-aware 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-11 13:43:29 +00:00
parent a0485f5c4f
commit 63e7f20595
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
django/utils/httpwrappers.py
View File

@ -151,10 +151,10 @@ class HttpResponse(object):
if not mimetype: if not mimetype:
mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET) mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
if hasattr(content, '__iter__'): if hasattr(content, '__iter__'):
self.iterator = content self._iterator = content
self._is_string = False self._is_string = False
else: else:
self.iterator = [content] self._iterator = [content]
self._is_string = True self._is_string = True
self.headers = {'Content-Type': mimetype} self.headers = {'Content-Type': mimetype}
self.cookies = SimpleCookie() self.cookies = SimpleCookie()
@ -200,23 +200,32 @@ class HttpResponse(object):
pass pass
def _get_content(self): def _get_content(self):
content = ''.join(self.iterator) content = ''.join(self._iterator)
if isinstance(content, unicode): if isinstance(content, unicode):
content = content.encode(self._charset) content = content.encode(self._charset)
return content return content
def _set_content(self, value): def _set_content(self, value):
self.iterator = [value] self._iterator = [value]
self._is_string = True self._is_string = True
content = property(_get_content, _set_content) 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. # The remaining methods partially implement the file-like object interface.
# See http://docs.python.org/lib/bltin-file-objects.html # See http://docs.python.org/lib/bltin-file-objects.html
def write(self, content): def write(self, content):
if not self._is_string: if not self._is_string:
raise Exception, "This %s instance is not writable" % self.__class__ raise Exception, "This %s instance is not writable" % self.__class__
self.iterator.append(content) self._iterator.append(content)
def flush(self): def flush(self):
pass pass
@ -224,7 +233,7 @@ class HttpResponse(object):
def tell(self): def tell(self):
if not self._is_string: if not self._is_string:
raise Exception, "This %s instance cannot tell its position" % self.__class__ 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): class HttpResponseRedirect(HttpResponse):
def __init__(self, redirect_to): def __init__(self, redirect_to):