mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 11:06:07 +00:00
Code Issues 27 Releases Wiki Activity

[py3] Fixed regression introduced in 536b030363.

Browse Source 
Refs #18764.

Reverted 536b030363 and switched to a more explicit way of avoiding
calling bytes(<int>).

This definitely deserves a refactoring. Specifically, _get_content
should just return b''.join(self). Unfortunately that's impossible
with the current tests.
This commit is contained in:
Aymeric Augustin 2012-08-19 17:52:22 +02:00
parent 536b030363
commit 2892cb0ec4
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
django/http/__init__.py
View File

@ -85,7 +85,7 @@ from django.core.files import uploadhandler
from django.http.multipartparser import MultiPartParser from django.http.multipartparser import MultiPartParser
from django.http.utils import * from django.http.utils import *
from django.utils.datastructures import MultiValueDict, ImmutableList from django.utils.datastructures import MultiValueDict, ImmutableList
from django.utils.encoding import force_bytes, force_text, iri_to_uri, smart_bytes, smart_str from django.utils.encoding import smart_bytes, smart_str, iri_to_uri, force_text
from django.utils.http import cookie_date from django.utils.http import cookie_date
from django.utils import six from django.utils import six
from django.utils import timezone from django.utils import timezone
@ -670,12 +670,16 @@ class HttpResponse(object):
expires='Thu, 01-Jan-1970 00:00:00 GMT') expires='Thu, 01-Jan-1970 00:00:00 GMT')
def _get_content(self): def _get_content(self):
# The logic below obeys the following constraints: if self.has_header('Content-Encoding'):
# - do not perform any encoding if a Content-Encoding is set (#4969) def make_bytes(value):
# - force string conversion of non-string types (#16494) if isinstance(value, int):
# - avoid simply calling bytes() with Python 3 (#18764) return six.text_type(value).encode()
encoding = 'ascii' if self.has_header('Content-Encoding') else self._charset elif isinstance(value, six.text_type):
return b''.join(force_bytes(e, encoding) for e in self._container) return value.encode('ascii')
else:
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)
def _set_content(self, value): def _set_content(self, value):
if hasattr(value, '__iter__') and not isinstance(value, (bytes, six.string_types)): if hasattr(value, '__iter__') and not isinstance(value, (bytes, six.string_types)):
@ -692,9 +696,12 @@ class HttpResponse(object):
return self return self
def __next__(self): def __next__(self):
# Use the same logic as _get_content. chunk = next(self._iterator)
encoding = 'ascii' if self.has_header('Content-Encoding') else self._charset if isinstance(chunk, int):
return force_bytes(next(self._iterator), encoding) return six.text_type(chunk).encode()
if isinstance(chunk, six.text_type):
return chunk.encode(self._charset)
return bytes(chunk)
next = __next__ # Python 2 compatibility next = __next__ # Python 2 compatibility