Make option -e to work with multipart messages

diff --git a/ChangeLog b/ChangeLog
index 0b51d69d1662459e96e9408448af36d4885ec046..36012e92dc8f7c19d9bf2896249e425e1a855f15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Version 2.5.1 (2014-04-??)
 
-   Make option -i to work with multipart messages.
+   Make options -e/-i to work with multipart messages.
 
    Open all files in binary mode. Output os.linesep instead of '\n'.
 

diff --git a/mimedecode.docbook b/mimedecode.docbook
index 7ca12cd5fa6a60c0db9d934533acba54724733b1..d01f49226af55735cd35bbcfcb8fec98c3640f94 100644 (file)
--- a/mimedecode.docbook
+++ b/mimedecode.docbook
@@ -521,9 +521,9 @@ cat input_file | mimedecode.py -o output_file</programlisting>
 </para>
 
 <para>
-  Option -i can also ignore a multipart subpart of a MIME message. In that case
-  the entire subtree of that multipart is removed and replaced with ignore
-  warning.
+  Options -e/-i can also work with multipart subparts of a MIME message. In
+  case of -i the entire subtree of that multipart is removed and replaced with
+  ignore warning.
 </para>
 
 <para>

diff --git a/mimedecode.py b/mimedecode.py
index 7d96a3d50a3eacb030265ae0846e7509843793d6..d239a1fe2234e332cb78b7d96387c687c98c6e70 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -394,6 +394,8 @@ def decode_multipart(msg):
             if boundary:
                 output("%s--%s--%s" % (os.linesep, boundary, os.linesep))
             return
+        elif content_type in g.error_mask:
+            raise ValueError, "content type %s prohibited" % ctype
 
     output_headers(msg)