From 660e262e69bf5c9e89c22f14a802218ec5843297 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 15 Jul 2009 14:06:03 -0400 Subject: [PATCH] Minor tweaks in send_pgp_mime.py * No reason to set maxheaderlen to something other than the default. * MIMEText sets content-type and charset automatically. --- interfaces/email/interactive/send_pgp_mime.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/interfaces/email/interactive/send_pgp_mime.py b/interfaces/email/interactive/send_pgp_mime.py index d5a6497..43c26d3 100644 --- a/interfaces/email/interactive/send_pgp_mime.py +++ b/interfaces/email/interactive/send_pgp_mime.py @@ -160,7 +160,7 @@ def flatten(msg): """ assert msg != None fp = StringIO() - g = Generator(fp, mangle_from_=False, maxheaderlen=60) + g = Generator(fp, mangle_from_=False) g.flatten(msg) text = fp.getvalue() return text @@ -329,9 +329,7 @@ class Mail (object): return target_emails(self.headermsg) def clearBodyPart(self): body = MIMEText(self.body) - body.add_header('Content-Type', 'text/plain') body.add_header('Content-Disposition', 'inline') - body.set_charset('us-ascii') return body def passphrase_arg(self, passphrase=None): if passphrase == None and PASSPHRASE != None: -- 2.26.2