From bdd2d93bfebbfcc90b2e08c7400b4b41814f70e7 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 26 Jan 2011 02:31:37 +0000 Subject: [PATCH] Revert r88197. I'll refix correctly once there is a test. --- Lib/email/generator.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Lib/email/generator.py b/Lib/email/generator.py index e382b8522b..9d33f1cb87 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -377,11 +377,8 @@ class BytesGenerator(Generator): def _handle_text(self, msg): # If the string has surrogates the original source was bytes, so # just write it back out. - payload = msg.get_payload() - if payload is None: - return - if _has_surrogates(payload): - self.write(payload) + if _has_surrogates(msg._payload): + self.write(msg._payload) else: super(BytesGenerator,self)._handle_text(msg) -- 2.40.0