From: Andrew Engelbrecht <sudoman@ninthfloor.org>
Date: Sun, 27 Jul 2014 05:57:36 +0000 (-0400)
Subject: organizational and whitespace changes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8ae432f0f86d7f57c791ee31870a11402a7034dd;p=edward.git

organizational and whitespace changes

easier to read
---

diff --git a/edward-bot b/edward-bot
index 67adf2e..aec4b6c 100755
--- a/edward-bot
+++ b/edward-bot
@@ -55,25 +55,27 @@ def msg_walk (msg):
         if part.get_content_type() == 'multipart':
             continue
 
+        charset   = part.get_content_charset()
+        payload_b = part.get_payload(decode=True)
+
         filename  = part.get_filename()
         conttype  = part.get_content_type()
         descrip_p = part.get_params(header='content-description')
 
-        charset   = part.get_content_charset()
-        payload_b = part.get_payload(decode=True)
+        if charset == None:
+            charset = 'utf-8'
 
         if payload_b == None:
             continue
+        else:
+            payload = payload_b.decode(charset)
+
 
         if descrip_p == None:
             decript = ""
         else:
             descript = descrip_p[0][0]
 
-        if charset == None:
-            charset = 'utf-8'
-
-        payload = payload_b.decode(charset)
 
         if conttype == "application/pgp-encrypted":
             if descript == 'PGP/MIME version identification':
@@ -82,7 +84,7 @@ def msg_walk (msg):
                             + payload.strip())
             continue
 
-        if (filename == "encrypted.asc") or (conttype == "pgp/mime"):
+        elif (filename == "encrypted.asc") or (conttype == "pgp/mime"):
             dec_msg = decrypt_payload(payload)
             print_decrypted(dec_msg)