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
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)