summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorJoel Hillacre <joel@403forbidden.ca>2017-07-06 21:29:09 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2017-07-06 21:29:09 (GMT)
commit3bbdf990a2c1b0b303b950058e3177a1bd5f697a (patch)
treeb2ebc2b052ae6ab7547d4101590ee7545c0d4c70 /Lib/email
parent710cc7667c27955272725729775cb39c40cca113 (diff)
downloadcpython-3bbdf990a2c1b0b303b950058e3177a1bd5f697a.zip
cpython-3bbdf990a2c1b0b303b950058e3177a1bd5f697a.tar.gz
cpython-3bbdf990a2c1b0b303b950058e3177a1bd5f697a.tar.bz2
bpo-30532: Fix whitespace folding in certain cases (#2592)
Leading whitespace was incorrectly dropped during folding of certain lines in the _header_value_parser's folding algorithm. This makes the whitespace handling code consistent.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/_header_value_parser.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index 5df9511..37a9fbc 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -341,9 +341,7 @@ class TokenList(list):
# avoid infinite recursion.
ws = part.pop_leading_fws()
if ws is not None:
- # Peel off the leading whitespace and make it sticky, to
- # avoid infinite recursion.
- folded.stickyspace = str(part.pop(0))
+ folded.stickyspace = str(ws)
if folded.append_if_fits(part):
continue
if part.has_fws: