From 3a7ee3ab5a251f440e8094b649f7592cf342c2d2 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 26 Jan 2011 00:39:19 +0000 Subject: Fix BytesGenerator._handle_text() if the message has no payload (None) --- Lib/email/generator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 9d33f1c..e382b85 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -377,8 +377,11 @@ class BytesGenerator(Generator): def _handle_text(self, msg): # If the string has surrogates the original source was bytes, so # just write it back out. - if _has_surrogates(msg._payload): - self.write(msg._payload) + payload = msg.get_payload() + if payload is None: + return + if _has_surrogates(payload): + self.write(payload) else: super(BytesGenerator,self)._handle_text(msg) -- cgit v0.12