]> git.phdru.name Git - mimedecode.git/commitdiff
Do not test if the message is multipart
authorOleg Broytman <phd@phdru.name>
Wed, 12 Feb 2014 18:11:00 +0000 (22:11 +0400)
committerOleg Broytman <phd@phdru.name>
Wed, 12 Feb 2014 18:24:04 +0000 (22:24 +0400)
Skip the second test.

mimedecode.py

index d3d23ff2595418c7cc68557d63d822802caf865e..f7f2e7fb2db8d62e2dd679fba3e5374bef78fce1 100755 (executable)
@@ -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"