From 59bc3fac3c5e21a2fb79a2cb4ad97a7d6da480b6 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Sun, 16 Aug 2015 00:43:38 -0400 Subject: [PATCH] mild refactoring --- edward | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/edward b/edward index 25bce8c..1f46c00 100755 --- a/edward +++ b/edward @@ -1295,10 +1295,10 @@ def generate_encrypted_mime (plaintext, email_to, email_subject, encrypt_to_key, A string version of the mime message, possibly encrypted and signed. """ - if (encrypt_to_key != None): + plaintext_mime = MIMEText(plaintext) + plaintext_mime.set_charset('utf-8') - plaintext_mime = MIMEText(plaintext) - plaintext_mime.set_charset('utf-8') + if (encrypt_to_key != None): encrypted_text = encrypt_sign_message(plaintext_mime.as_string(), encrypt_to_key, @@ -1323,8 +1323,7 @@ def generate_encrypted_mime (plaintext, email_to, email_subject, encrypt_to_key, message_mime['Content-Disposition'] = 'inline' else: - message_mime = MIMEText(plaintext) - message_mime.set_charset('utf-8') + message_mime = plaintext_mime message_mime['To'] = email_to message_mime['Subject'] = email_subject -- 2.25.1