summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-19 22:18:55 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-19 22:18:55 (GMT)
commit14b0124a29489e4b114b960e4f2ce0b55acbace6 (patch)
tree00b4a63558f3925e993f9a70d06cabbaef034720
parent843fae93121ac7ac1088b0521773eff567e7b41c (diff)
downloadcpython-14b0124a29489e4b114b960e4f2ce0b55acbace6.zip
cpython-14b0124a29489e4b114b960e4f2ce0b55acbace6.tar.gz
cpython-14b0124a29489e4b114b960e4f2ce0b55acbace6.tar.bz2
#1525919: Document MIMEText+set_payload encoding behavior.
-rw-r--r--Doc/library/email.mime.rst12
1 files changed, 11 insertions, 1 deletions
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
index ae340f7..2ce4868 100644
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -185,5 +185,15 @@ Here are the classes:
minor type and defaults to :mimetype:`plain`. *_charset* is the character
set of the text and is passed as a parameter to the
:class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults
- to ``us-ascii``. No guessing or encoding is performed on the text data.
+ to ``us-ascii``.
+
+ Unless the ``_charset`` parameter is explicitly set to ``None``, the
+ MIMEText object created will have both a :mailheader:`Content-Type` header
+ with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding`
+ header. This means that a subsequent ``set_payload`` call will not result
+ in an encoded payload, even if a charset is passed in the ``set_payload``
+ command. You can "reset" this behavior by deleting the
+ ``Content-Transfer-Encoding`` header, after which a ``set_payload`` call
+ will automatically encode the new payload (and add a new
+ :mailheader:`Content-Transfer-Encoding` header).