From: Barry Warsaw <barry@python.org>
Date: Fri, 19 Jul 2002 22:21:02 +0000 (+0000)
Subject: _dispatch(): Use the new Message.get_content_type() method as hashed
X-Git-Tag: v2.3c1~4919
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cecdc6bcb3226c2a0a071406e3b06308fbb1369;p=thirdparty%2FPython%2Fcpython.git

_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 9377b53025ef..a8e2cfe57d34 100644
--- 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('-', '_')