commit 6f950023c6a2168b229363d75f59a24ecdd66d19
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Jul 30 10:27:06 2021 -0700
committer GitHub <noreply@github.com> Fri Jul 30 19:27:06 2021 +0200
tree 3d4c88a355e77cf1c35b8f94718667a0c959463c
parent 843b3d28209b7754c51c6cc3844f66808b6dbdaf

bpo-42892: fix email multipart attribute error (GH-26903) (GH-27492)

(cherry picked from commit e3f877c32d7cccb734f45310f26beeec793364ce)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>

Lib/email/message.py

diff --git a/Lib/email/message.py b/Lib/email/message.py
index db30d9a..6752ce0 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -982,7 +982,7 @@ def _find_body(self, part, preferencelist):
             if subtype in preferencelist:
                 yield (preferencelist.index(subtype), part)
             return
-        if maintype != 'multipart':
+        if maintype != 'multipart' or not self.is_multipart():
             return
         if subtype != 'related':
             for subpart in part.iter_parts():
@@ -1087,7 +1087,7 @@ def iter_parts(self):
 
         Return an empty iterator for a non-multipart.
         """
-        if self.get_content_maintype() == 'multipart':
+        if self.is_multipart():
             yield from self.get_payload()
 
     def get_content(self, *args, content_manager=None, **kw):