diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-18 00:03:10 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-19 16:01:38 -0800 |
| commit | d77e649b6a53500fcca87b1b02ecf18846d917ac (patch) | |
| tree | 4527b5a68afa980a13425c13019c840f61755651 | |
| parent | a310423801c0042045978d20a8522736ff5f75ed (diff) | |
| download | portage-d77e649b6a53500fcca87b1b02ecf18846d917ac.tar.gz portage-d77e649b6a53500fcca87b1b02ecf18846d917ac.tar.bz2 portage-d77e649b6a53500fcca87b1b02ecf18846d917ac.zip | |
mail: handle unicode in subject for python3
| -rw-r--r-- | pym/portage/mail.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pym/portage/mail.py b/pym/portage/mail.py index f87efe262..598c1f9b7 100644 --- a/pym/portage/mail.py +++ b/pym/portage/mail.py @@ -67,9 +67,19 @@ def create_message(sender, recipient, subject, body, attachments=None): mymessage.set_unixfrom(sender) mymessage["To"] = recipient mymessage["From"] = sender - # Use Header as a workaround so that long subject lines are wrapped - # correctly by <=python-2.6 (gentoo bug #263370, python issue #1974). - mymessage["Subject"] = Header(subject) + + if sys.hexversion >= 0x3000000: + # Avoid UnicodeEncodeError in python3 with non-ascii characters. + # File "/usr/lib/python3.1/email/header.py", line 189, in __init__ + # self.append(s, charset, errors) + # File "/usr/lib/python3.1/email/header.py", line 262, in append + # input_bytes = s.encode(input_charset, errors) + #UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-9: ordinal not in range(128) + mymessage["Subject"] = subject + else: + # Use Header as a workaround so that long subject lines are wrapped + # correctly by <=python-2.6 (gentoo bug #263370, python issue #1974). + mymessage["Subject"] = Header(subject) mymessage["Date"] = time.strftime("%a, %d %b %Y %H:%M:%S %z") return mymessage |