X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=1e3bf74b3964717de33883c8b160c19db805f664;hb=63f035c2a1e63b84155a41adbaadfc842615a1d6;hp=b461284e1e60270faa2f613ea3b4a707f991e321;hpb=aad73ab7b281381e464446e16bd9c88344f89d11;p=mimedecode.git

diff --git a/mimedecode.py b/mimedecode.py
index b461284..1e3bf74 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -312,7 +312,10 @@ def decode_part(msg):
 
     left_binary = False
     for content_type in masks:
-        if content_type in g.binary_mask:
+        if content_type in g.totext_mask or \
+           content_type in g.decoded_binary_mask:
+            break
+        elif content_type in g.binary_mask:
             left_binary = True
             break
 
@@ -335,10 +338,10 @@ def decode_part(msg):
             break
         elif content_type in g.ignore_mask:
             output_headers(msg)
-            output("\nMessage body of type `%s' skipped.\n" % content_type)
+            output("\nMessage body of type %s skipped.\n" % ctype)
             break
         elif content_type in g.error_mask:
-            raise ValueError, "content type `%s' prohibited" % content_type
+            raise ValueError, "content type %s prohibited" % ctype
     else:
         # Neither content type nor masks were listed - decode by default
         outstring = totext(msg, outstring)