From 45bf773f605bdee3b4f8334a97d6130a75b9286a Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 17 Jul 2010 01:19:57 +0000 Subject: #1555570: correctly handle a \r\n that is split by the read buffer. Patch and test by Tony Nelson. --- Lib/email/feedparser.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Lib/email/feedparser.py') diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py index a6853c2b6d..8db70b3c36 100644 --- a/Lib/email/feedparser.py +++ b/Lib/email/feedparser.py @@ -104,6 +104,10 @@ class BufferedSubFile(object): # data after the final RE. In the case of a NL/CR terminated string, # this is the empty string. self._partial = parts.pop() + #GAN 29Mar09 bugs 1555570, 1721862 Confusion at 8K boundary ending with \r: + # is there a \n to follow later? + if not self._partial and parts and parts[-1].endswith('\r'): + self._partial = parts.pop(-2)+parts.pop() # parts is a list of strings, alternating between the line contents # and the eol character(s). Gather up a list of lines after # re-attaching the newlines. -- cgit v1.2.1