#1555570: correctly handle a \r\n that is split by the read buffer.
Patch and test by Tony Nelson.
diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
index a6853c2..8db70b3 100644
--- a/Lib/email/feedparser.py
+++ b/Lib/email/feedparser.py
@@ -104,6 +104,10 @@
# 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.
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index be0565e..09f51df 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -2454,6 +2454,39 @@
-Me
""")
+ def test_pushCR_LF(self):
+ '''FeedParser BufferedSubFile.push() assumed it received complete
+ line endings. A CR ending one push() followed by a LF starting
+ the next push() added an empty line.
+ '''
+ imt = [
+ ("a\r \n", 2),
+ ("b", 0),
+ ("c\n", 1),
+ ("", 0),
+ ("d\r\n", 1),
+ ("e\r", 0),
+ ("\nf", 1),
+ ("\r\n", 1),
+ ]
+ from email.feedparser import BufferedSubFile, NeedMoreData
+ bsf = BufferedSubFile()
+ om = []
+ nt = 0
+ for il, n in imt:
+ bsf.push(il)
+ nt += n
+ n1 = 0
+ while True:
+ ol = bsf.readline()
+ if ol == NeedMoreData:
+ break
+ om.append(ol)
+ n1 += 1
+ self.assertTrue(n == n1)
+ self.assertTrue(len(om) == nt)
+ self.assertTrue(''.join([il for il, n in imt]) == ''.join(om))
+
class TestParsers(TestEmailBase):
diff --git a/Misc/NEWS b/Misc/NEWS
index 494fa1a..7abb564 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -473,6 +473,9 @@
Library
-------
+- Issue #1555570: email no longer inserts extra blank lines when a \r\n
+ combo crosses an 8192 byte boundary.
+
- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee.
- ``ast.literal_eval()`` now allows byte literals.