From: Oleg Broytman <phd@phdru.name>
Date: Tue, 11 Mar 2014 16:41:06 +0000 (+0400)
Subject: Report actual content type; do not use quotes
X-Git-Tag: v2.5.0~24
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6f1f365730f3a886ce31abe39cc4cc0f992206f0;p=mimedecode.git

Report actual content type; do not use quotes
---

diff --git a/mimedecode.py b/mimedecode.py
index b461284..9af561e 100755
--- 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 eb05c7e..50d8a05 100644
--- 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--