From bd89029f8a4ae4c98c14e105c3e9e987c69d0805 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 13 Mar 2014 03:52:40 +0400 Subject: [PATCH] Raise error after saving the part --- mimedecode.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mimedecode.py b/mimedecode.py index 1e3bf74..1006fb4 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -341,7 +341,7 @@ def decode_part(msg): output("\nMessage body of type %s skipped.\n" % ctype) break elif content_type in g.error_mask: - raise ValueError, "content type %s prohibited" % ctype + break else: # Neither content type nor masks were listed - decode by default outstring = totext(msg, outstring) @@ -354,6 +354,10 @@ def decode_part(msg): elif content_type in g.save_message_mask: _save_message(msg, outstring, save_headers=True, save_body=True) + for content_type in masks: + if content_type in g.error_mask: + raise ValueError, "content type %s prohibited" % ctype + def decode_multipart(msg): "Decode multipart" -- 2.39.2