diff options
Diffstat (limited to 'Lib/email/generator.py')
| -rw-r--r-- | Lib/email/generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 2d6a191..d46549c 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -151,7 +151,7 @@ class Generator: payload = msg.get_payload() if payload is None: return - if not isinstance(payload, basestring): + if not isinstance(payload, str): raise TypeError('string payload expected: %s' % type(payload)) if self._mangle_from_: payload = fcre.sub('>From ', payload) @@ -168,7 +168,7 @@ class Generator: subparts = msg.get_payload() if subparts is None: subparts = [] - elif isinstance(subparts, basestring): + elif isinstance(subparts, str): # e.g. a non-strict parse of a message with no starting boundary. self._fp.write(subparts) return @@ -288,7 +288,7 @@ class DecodedGenerator(Generator): for part in msg.walk(): maintype = part.get_content_maintype() if maintype == 'text': - print(part.get_payload(decode=True), file=self) + print(part.get_payload(decode=False), file=self) elif maintype == 'multipart': # Just skip this pass |