1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

[1.6.x] Fixed #22107 -- Fixed django.core.files.File object iteration.

Due to a mixup between text and bytes, iteration over
a File instance was broken under Python 3.

Thanks to trac user pdewacht for the report and patch.

Backport of 3841feee86 from master.
This commit is contained in:
Baptiste Mispelon
2014-02-20 19:13:25 +01:00
parent e56ce87bd8
commit 12da6902e9
2 changed files with 10 additions and 1 deletions

View File

@@ -103,7 +103,7 @@ class File(FileProxyMixin):
# If this is the end of a line, yield
# otherwise, wait for the next round
if line[-1] in ('\n', '\r'):
if line[-1:] in (b'\n', b'\r'):
yield line
else:
buffer_ = line