From: Oleg Broytman <phd@phdru.name>
Date: Wed, 12 Feb 2014 18:11:00 +0000 (+0400)
Subject: Do not test if the message is multipart
X-Git-Tag: v2.3.5~15
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=3d3215a3467d1ae949f231c64ca32330c3bdd29c;p=mimedecode.git

Do not test if the message is multipart

Skip the second test.
---

diff --git a/mimedecode.py b/mimedecode.py
index d3d23ff..f7f2e7f 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -234,27 +234,27 @@ def decode_part(msg):
 def decode_multipart(msg):
     "Decode multipart"
 
-    if msg.is_multipart():
-        decode_headers(msg)
-        output_headers(msg)
+    decode_headers(msg)
+    output_headers(msg)
 
-        if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
-            output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
+    if msg.preamble: # Preserve the first part, it is probably not a RFC822-message
+        output(msg.preamble) # Usually it is just a few lines of text (MIME warning)
 
-        boundary = msg.get_boundary()
+    boundary = msg.get_boundary()
 
-        for subpart in msg.get_payload():
-            if boundary:
-                output("\n--%s\n" % boundary)
+    for subpart in msg.get_payload():
+        if boundary:
+            output("\n--%s\n" % boundary)
 
-            # Recursively decode all parts of the subpart
-            decode_message(subpart)
+        # Recursively decode all parts of the subpart
+        decode_message(subpart)
 
-        if boundary:
-            output("\n--%s--\n" % boundary)
+    if boundary:
+        output("\n--%s--\n" % boundary)
+
+    if msg.epilogue:
+        output(msg.epilogue)
 
-        if msg.epilogue:
-            output(msg.epilogue)
 
 def decode_message(msg):
     "Decode message"