From: Oleg Broytman <phd@phdru.name>
Date: Wed, 5 Feb 2014 16:34:33 +0000 (+0400)
Subject: Refactoring: move subpart decoding inside decode_file
X-Git-Tag: v2.3.4~4
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=fb1bca196122731a2c21ecd9e37413f19337fcd2;p=mimedecode.git

Refactoring: move subpart decoding inside decode_file
---

diff --git a/mimedecode.py b/mimedecode.py
index 164cebf..6c29a96 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -185,12 +185,6 @@ def recode_charset(msg, s):
 def totext(msg, instring):
     "Convert instring content to text"
 
-    if msg.is_multipart(): # Recursively decode all parts of the multipart message
-        newfile = StringIO(msg.as_string())
-        newfile.seek(0)
-        decode_file(newfile)
-        return
-
     # Decode body and recode charset
     s = decode_body(msg, instring)
     if gopts.recode_charset:
@@ -258,7 +252,13 @@ def decode_file(infile):
 
         for subpart in msg.get_payload():
             output("\n--%s\n" % boundary)
-            decode_part(subpart)
+
+            if subpart.is_multipart(): # Recursively decode all parts of the subpart
+                newfile = StringIO(subpart.as_string())
+                newfile.seek(0)
+                decode_file(newfile)
+            else:
+                decode_part(subpart)
 
         output("\n--%s--\n" % boundary)