From 65ed3800011c7aca15b1ca146f04f5552b3f1ca4 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht <andrew@localhost.localdomain> Date: Sat, 18 Jul 2015 17:23:56 -0400 Subject: [PATCH] removed a function, changed a func name the removed function will eventually be replaced by a reply generation function. --- edward-bot | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/edward-bot b/edward-bot index 1a7ffbf..76c3758 100755 --- a/edward-bot +++ b/edward-bot @@ -41,27 +41,18 @@ def main (): handle_args() email_text = sys.stdin.read() - message, keys = decode_simplify_email(email_text) - print(message) + plaintext, keys = email_decode_flatten (email_text) + email_from, email_subject = email_from_subject(email_text) + + print("From: " + email_from) + print("Subject: " + email_subject) + print(plaintext) for key in keys: print(key.subkeys[0].fpr) -def decode_simplify_email (email_text): - - plaintext, keys = email_decode_flatten(email_text) - - email_from, email_subject = get_from_subject(email_text) - - simplified_msg = "From: " + email_from + "\n" - simplified_msg += "Subject: " + email_subject + "\n\n" - simplified_msg += plaintext - - return simplified_msg, keys - - def email_decode_flatten (email_text): body = "" @@ -104,7 +95,7 @@ def email_decode_flatten (email_text): return body, keys -def get_from_subject (email_text): +def email_from_subject (email_text): email_struct = email.parser.Parser().parsestr(email_text) -- 2.25.1