Issues #23147, #23148: Presumably fixed bugs in folding UnstructuredTokenList.

serhiy-storchaka · serhiy-storchaka · commit 6c2f1fd71075 · 2016-07-17T13:25:15.000+03:00
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
@@ -439,7 +439,7 @@ def _fold(self, folded):
                 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 @@ def cte_encode(self, charset, policy):
                     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)
 
 
