From 638d40b4337808f5e7c3f415f49270185c893321 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 24 Aug 2012 11:14:13 -0400
Subject: #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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Lib/email/generator.py')

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 02487e3082..c6bfb704f5 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -391,6 +391,8 @@ class BytesGenerator(Generator):
         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)
-- 
cgit v1.2.1