From: Chase Sterling Date: Tue, 3 Jan 2012 05:38:59 +0000 (-0500) Subject: Make sure newlines at chunk borders do not get dropped using iter_lines. X-Git-Tag: v0.9.1~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5174ab43257e1675d119335166b40fdbb2d68bf3;p=services%2Fpython-requests.git Make sure newlines at chunk borders do not get dropped using iter_lines. --- diff --git a/requests/models.py b/requests/models.py index 9b01fb2..5bfd3fa 100644 --- a/requests/models.py +++ b/requests/models.py @@ -636,15 +636,15 @@ class Response(object): for chunk in self.iter_content(chunk_size, decode_unicode=decode_unicode): if pending is not None: chunk = pending + chunk - lines = chunk.splitlines() + lines = chunk.splitlines(True) for line in lines[:-1]: - yield line + yield line.rstrip() # Save the last part of the chunk for next iteration, to keep full line together pending = lines[-1] # Yield the last line if pending is not None: - yield pending + yield pending.rstrip() @property