commit 638d40b4337808f5e7c3f415f49270185c893321
author R David Murray <rdmurray@bitdance.com> Fri Aug 24 11:14:13 2012 -0400
committer R David Murray <rdmurray@bitdance.com> Fri Aug 24 11:14:13 2012 -0400
tree 6dccf92953e8c51f1cceabae459d1f557abc22d1
parent f2b34b8b9669598d4294488cf3bb8ab4465b7097

#15249: Mangle From lines correctly when body contains invalid bytes.

Fix by Colin Su.  Test by me, based on a test written by Petri Lehtinen.

Lib/email/generator.py

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 02487e3..c6bfb70 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -391,6 +391,8 @@
         if msg._payload is None:
             return
         if _has_surrogates(msg._payload):
+            if self._mangle_from_:
+                msg._payload = fcre.sub(">From ", msg._payload)
             self.write(msg._payload)
         else:
             super(BytesGenerator,self)._handle_text(msg)