From 6815fa63c28a467b91824320a76e9f1e3bb7a0b3 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 18 Jul 2009 08:47:11 -0400 Subject: [PATCH] Added send_pgp_mime.Mail.encodedMIMEText() for unicode handling. Now be-handle-mail handles examples/unicode without crashing cat examples/unicode | ./be-handle-mail -o -l - But the output email is encoded in base64: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 From: BE Bugs To: John Doe Date: Sat, 18 Jul 2009 12:22:05 +0000 Subject: [be-bug] Re: show In-reply-to: UmVzdWx0cyBvZiBydW5uaW5nOiAoZXhpdCBjb2RlIDApCiAgc2hvdyAKCnN0ZG91dDoKCjw/eG1s IHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiA/Pgo8YnVnPgogIDx1dWlkPmY3Y2NkOTE2 LWI1YzctNDg5MC1hMmUzLThjOGFjZTE3YWUzYTwvdXVpZD4KICA8c2hvcnQtbmFtZT5mN2M8L3No b3J0LW5hbWU+CiAgPHNldmVyaXR5Pm1pbm9yPC9zZXZlcml0eT4KICA8c3RhdHVzPmZpeGVkPC9z ... This is perhaps the best we can get out of python < 3.1/2.7, see http://bugs.python.org/issue1368247 --- interfaces/email/interactive/send_pgp_mime.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/interfaces/email/interactive/send_pgp_mime.py b/interfaces/email/interactive/send_pgp_mime.py index a10674a..f66c626 100644 --- a/interfaces/email/interactive/send_pgp_mime.py +++ b/interfaces/email/interactive/send_pgp_mime.py @@ -80,6 +80,7 @@ have been warned. verboseInvoke = False PGP_SIGN_AS = None PASSPHRASE = None +DEFAULT_BODY_ENCODING = "UTF-8" # The following commands are adapted from my .mutt/pgp configuration # @@ -164,7 +165,8 @@ def flatten(msg): g = Generator(fp, mangle_from_=False) g.flatten(msg) text = fp.getvalue() - return text + encoding = msg.get_content_charset() + return unicode(text, encoding=encoding) def source_email(msg, return_realname=False): """ @@ -342,8 +344,15 @@ class Mail (object): return source_email(self.headermsg) def targetEmails(self): return target_emails(self.headermsg) + def encodedMIMEText(self, body, encoding=None): + if encoding == None: + encoding = DEFAULT_BODY_ENCODING + if type(body) == types.StringType: + encoding = "US-ASCII" + # Create the message ('plain' stands for Content-Type: text/plain) + return MIMEText(body.encode(encoding), 'plain', encoding) def clearBodyPart(self): - body = MIMEText(self.body) + body = self.encodedMIMEText(self.body) body.add_header('Content-Disposition', 'inline') return body def passphrase_arg(self, passphrase=None): @@ -356,7 +365,7 @@ class Mail (object): """ text/plain """ - msg = MIMEText(self.body) + msg = self.encodedMIMEText(self.body) for k,v in self.headermsg.items(): msg[k] = v return msg -- 2.26.2