[Python-checkins] cpython (merge 3.5 -> default): Issues #23147, #23148: Presumably fixed bugs in folding UnstructuredTokenList.

Sun Jul 17 06:26:30 EDT 2016

https://hg.python.org/cpython/rev/33593fcdf8b0
changeset: 102381:33593fcdf8b0
parent: 102379:d87f99e297d5
parent: 102380:efd4ffa88173
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Jul 17 13:26:10 2016 +0300
summary:
 Issues #23147, #23148: Presumably fixed bugs in folding UnstructuredTokenList.
files:
 Lib/email/_header_value_parser.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -439,7 +439,7 @@
 if folded.append_if_fits(part):
 continue
 if part.has_fws:
- part.fold(folded)
+ part._fold(folded)
 continue
 # It can't be split...we just have to put it on its own line.
 folded.append(tstr)
@@ -460,7 +460,7 @@
 last_ew = len(res)
 else:
 tl = get_unstructured(''.join(res[last_ew:] + [spart]))
- res.append(tl.as_encoded_word())
+ res.append(tl.as_encoded_word(charset))
 return ''.join(res)
 
 
-- 
Repository URL: https://hg.python.org/cpython
