From d65993b89228fbd6cc6aee2278e9b47c783f41c7 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Tue, 21 Jul 2015 20:27:08 -0400 Subject: [PATCH] moved function --- edward | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/edward b/edward index 8304f69..ca332ef 100755 --- a/edward +++ b/edward @@ -321,16 +321,6 @@ def flatten_payload_pieces (eddy_obj, _ignore): return string -def email_from_subject (email_text): - - email_struct = email.parser.Parser().parsestr(email_text) - - email_from = email_struct['From'] - email_subject = email_struct['Subject'] - - return email_from, email_subject - - def add_gpg_key (key_block, gpgme_ctx): fp = io.BytesIO(key_block.encode('ascii')) @@ -400,6 +390,17 @@ def choose_reply_encryption_key (gpgme_ctx, fingerprints): return reply_key +def email_to_from_subject (email_text): + + email_struct = email.parser.Parser().parsestr(email_text) + + email_to = email_struct['To'] + email_from = email_struct['From'] + email_subject = email_struct['Subject'] + + return email_to, email_from, email_subject + + def generate_encrypted_mime (plaintext, email_from, email_subject, encrypt_to_key, gpgme_ctx): -- 2.25.1