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/Message.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/Message.py')
| -rw-r--r-- | Lib/email/Message.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/email/Message.py b/Lib/email/Message.py index 88fd786..bc76416 100644 --- a/Lib/email/Message.py +++ b/Lib/email/Message.py @@ -250,11 +250,14 @@ class Message: charset=charset.get_output_charset()) else: self.set_param('charset', charset.get_output_charset()) + if str(charset) <> charset.get_output_charset(): + self._payload = charset.body_encode(self._payload) if not self.has_key('Content-Transfer-Encoding'): cte = charset.get_body_encoding() try: cte(self) except TypeError: + self._payload = charset.body_encode(self._payload) self.add_header('Content-Transfer-Encoding', cte) def get_charset(self): |