Report actual content type; do not use quotes

diff --git a/mimedecode.py b/mimedecode.py
index b461284e1e60270faa2f613ea3b4a707f991e321..9af561e90ddc4b87616c2d84f5041eae06be8ef9 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -335,10 +335,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)

diff --git a/test/expected/msg_15-2.txt b/test/expected/msg_15-2.txt
index eb05c7e83aebc6fb802c7bd2d9f166526dc72958..50d8a05203d7ba71c3a7d7d2672c2b154e2230cf 100644 (file)
--- a/test/expected/msg_15-2.txt
+++ b/test/expected/msg_15-2.txt
@@ -33,7 +33,7 @@ Content-transfer-encoding: 8bit
 X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
 
 
-Message body of type `text/html' skipped.
+Message body of type text/html skipped.
 
 --MS_Mac_OE_3071477847_720252_MIME_Part--