From c96f3837667e479b35cbeaecf0d1366438d6dd9f Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Sun, 27 Jul 2014 03:12:11 -0400 Subject: [PATCH] intermediary variable isn't needed it's sufficiently clear this way, and uses less code. --- edward-bot | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/edward-bot b/edward-bot index 15d5328..7e68f9a 100755 --- a/edward-bot +++ b/edward-bot @@ -35,12 +35,18 @@ import re import io import time + def main (): handle_args() - txt = sys.stdin.read() - msg = email.parser.Parser().parsestr(txt) + email_text = sys.stdin.read() + print(decode_email(email_text)) + + +def decode_email (text): + + msg = email.parser.Parser().parsestr(text) message = "" message += "From: " + msg['From'] + "\n" @@ -48,7 +54,7 @@ def main (): message += msg_walk(msg) - print(message) + return message def msg_walk (msg): @@ -73,8 +79,7 @@ def msg_walk (msg): if (filename == "encrypted.asc") or (conttype == "pgp/mime"): - payload_dec = decrypt_payload(payload) - body += payload_dec + body += decrypt_payload(payload) elif conttype == "text/plain": body += payload + "\n" @@ -84,6 +89,7 @@ def msg_walk (msg): return body + def get_part_info (part): charset = part.get_content_charset() -- 2.25.1