_dispatch(): Use the new Message.get_content_type() method as hashed

out on the mimelib-devel list.

diff --git a/Lib/email/Generator.py b/Lib/email/Generator.py
index 9377b53025ef92e50636d0a370fcf3e318a7db0f..a8e2cfe57d34154526f6c924737636d53ed29094 100644 (file)
--- a/Lib/email/Generator.py
+++ b/Lib/email/Generator.py
@@ -123,12 +123,7 @@ class Generator:
         # self._handle_<maintype>_<subtype>().  If there's no handler for the
         # full MIME type, then dispatch to self._handle_<maintype>().  If
         # that's missing too, then dispatch to self._writeBody().
-        ctype = msg.get_type()
-        if ctype is None:
-            # No Content-Type: header so use the default type, which must be
-            # either text/plain or message/rfc822.
-            ctype = msg.get_default_type()
-            assert ctype in ('text/plain', 'message/rfc822')
+        ctype = msg.get_content_type()
         # We do have a Content-Type: header.
         main, sub = ctype.split('/')
         specific = UNDERSCORE.join((main, sub)).replace('-', '_')