p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[py3] Fixed another regression from 2892cb0ec4.

This commit is contained in:
Aymeric Augustin 2012-08-19 18:23:28 +02:00
parent 2892cb0ec4
commit 5f2d9cdbb1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/http/__init__.py
View File

@ -673,11 +673,11 @@ class HttpResponse(object):
if self.has_header('Content-Encoding'):
def make_bytes(value):
if isinstance(value, int):
return six.text_type(value).encode()
elif isinstance(value, six.text_type):
return value.encode('ascii')
else:
return bytes(value)
value = six.text_type(value)
if isinstance(value, six.text_type):
value = value.encode('ascii')
# force conversion to bytes in case chunk is a subclass
return bytes(value)
return b''.join(make_bytes(e) for e in self._container)
return b''.join(smart_bytes(e, self._charset) for e in self._container)
@ -698,9 +698,10 @@ class HttpResponse(object):
def __next__(self):
chunk = next(self._iterator)
if isinstance(chunk, int):
return six.text_type(chunk).encode()
chunk = six.text_type(chunk)
if isinstance(chunk, six.text_type):
return chunk.encode(self._charset)
chunk = chunk.encode(self._charset)
# force conversion to bytes in case chunk is a subclass
return bytes(chunk)
next = __next__ # Python 2 compatibility