diff options
| author | Barry Warsaw <barry@python.org> | 2006-02-08 14:34:21 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2006-02-08 14:34:21 (GMT) |
| commit | e58df82919808939f21e9756af65c5afb5d8b2e5 (patch) | |
| tree | ebf1e42f435a305f4259a53b2d34675ff5f2bc1c /Lib/email/Generator.py | |
| parent | a871ef2b3e924f058ec1b0aed7d4c83a546414b7 (diff) | |
| download | cpython-e58df82919808939f21e9756af65c5afb5d8b2e5.zip cpython-e58df82919808939f21e9756af65c5afb5d8b2e5.tar.gz cpython-e58df82919808939f21e9756af65c5afb5d8b2e5.tar.bz2 | |
Port relevant patches for SF 1409455 to the trunk for email 3.0/Python 2.5.
Will port to Python 2.4.
Diffstat (limited to 'Lib/email/Generator.py')
| -rw-r--r-- | Lib/email/Generator.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/email/Generator.py b/Lib/email/Generator.py index 9411a9e..7969916 100644 --- a/Lib/email/Generator.py +++ b/Lib/email/Generator.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2004 Python Software Foundation +# Copyright (C) 2001-2006 Python Software Foundation # Author: Barry Warsaw # Contact: email-sig@python.org @@ -175,9 +175,6 @@ class Generator: payload = msg.get_payload() if payload is None: return - cset = msg.get_charset() - if cset is not None: - payload = cset.body_encode(payload) if not isinstance(payload, basestring): raise TypeError('string payload expected: %s' % type(payload)) if self._mangle_from_: |