#11492: fix header truncation on folding when there are runs of split chars.
Not a complete fix for this issue.
diff --git a/Lib/email/header.py b/Lib/email/header.py
index da739d5..a7963ac 100644
--- a/Lib/email/header.py
+++ b/Lib/email/header.py
@@ -464,12 +464,13 @@
self._current_line.reset(str(holding))
return
elif not nextpart:
- # There must be some trailing split characters because we
+ # There must be some trailing or duplicated split characters
+ # because we
# found a split character but no next part. In this case we
# must treat the thing to fit as the part + splitpart because
# if splitpart is whitespace it's not allowed to be the only
# thing on the line, and if it's not whitespace we must split
- # after the syntactic break. In either case, we're done.
+ # after the syntactic break.
holding_prelen = len(holding)
holding.push(part + splitpart)
if len(holding) + len(self._current_line) <= self._maxlen:
@@ -484,7 +485,7 @@
self._lines.append(str(self._current_line))
holding.reset(save_part)
self._current_line.reset(str(holding))
- return
+ holding.reset()
elif not part:
# We're leading with a split character. See if the splitpart
# and nextpart fits on the current line.
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 5b8b7bf..e06c461 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -793,6 +793,16 @@
;
this_part_does_not_fit_within_maxlinelen_and_thus_should_be_on_a_line_all_by_itself;""")
+ def test_long_header_with_multiple_sequential_split_chars(self):
+ # Issue 11492
+
+ eq = self.ndiffAssertEqual
+ h = Header('This is a long line that has two whitespaces in a row. '
+ 'This used to cause truncation of the header when folded')
+ eq(h.encode(), """\
+This is a long line that has two whitespaces in a row. This used to cause
+ truncation of the header when folded""")
+
def test_no_split_long_header(self):
eq = self.ndiffAssertEqual
hstr = 'References: ' + 'x' * 80