From 0164b6bf227ca920af52608784f5c5605b6d3283 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Mon, 15 Oct 2001 04:38:22 +0000 Subject: [PATCH] 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. --- Lib/email/Iterators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/email/Iterators.py b/Lib/email/Iterators.py index d1ee53fe2d..a64495d9b0 100644 --- a/Lib/email/Iterators.py +++ b/Lib/email/Iterators.py @@ -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 -- 2.40.0