Revert r88197. I'll refix correctly once there is a test.

bdd2d93b · R. David Murray · 14eb4c35 · bdd2d93b
Commit bdd2d93b authored Jan 26, 2011 by R. David Murray
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

Lib/email/generator.py Lib/email/generator.py +2 -5

No files found.
--- 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 _has_surrogates(msg._payload):
-        if payload is None:
+            self.write(msg._payload)
-            return
-        if _has_surrogates(payload):
-            self.write(payload)
        else:
            super(BytesGenerator,self)._handle_text(msg)