[Python-checkins] cpython (merge 3.2 -> 3.3): Merge: #1525919: Document MIMEText+set_payload encoding behavior.
r.david.murray
python-checkins at python.org
Tue Mar 19 23:22:05 CET 2013
http://hg.python.org/cpython/rev/fcbc28ef96a3
changeset: 82784:fcbc28ef96a3
branch: 3.3
parent: 82780:6dcc9628065c
parent: 82783:ba500b179c3a
user: R David Murray <rdmurray at bitdance.com>
date: Tue Mar 19 18:21:22 2013 -0400
summary:
Merge: #1525919: Document MIMEText+set_payload encoding behavior.
files:
Doc/library/email.mime.rst | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst
--- a/Doc/library/email.mime.rst
+++ b/Doc/library/email.mime.rst
@@ -187,3 +187,13 @@
:class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults
to ``us-ascii`` if the string contains only ``ascii`` codepoints, and
``utf-8`` otherwise.
+
+ 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).
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list