typed_subpart_iterator(): When getting the main type use 'text' as the

failobj, and when getting the subtype use 'plain' as the failobj.
text/plain is supposed to be the default if the message contains no
Content-Type: header.
This commit is contained in:
Barry Warsaw 2001-10-15 04:38:22 +00:00
parent 0fae49fc7b
commit 0164b6bf22

View file

@ -28,6 +28,6 @@ def typed_subpart_iterator(msg, maintype='text', subtype=None):
omitted, only the main type is matched.
"""
for subpart in msg.walk():
if subpart.get_main_type() == maintype:
if subtype is None or subpart.get_subtype() == subtype:
if subpart.get_main_type('text') == maintype:
if subtype is None or subpart.get_subtype('plain') == subtype:
yield subpart