[Python-checkins] cpython (merge 3.3 -> 3.3): merge heads

[gregory.p.smith]

http://hg.python.org/cpython/rev/a5a0d87f3dcc
changeset:   82793:a5a0d87f3dcc
branch:      3.3
parent:      82790:9e501d0fb68c
parent:      82784:fcbc28ef96a3
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Mar 19 15:25:46 2013 -0700
summary:
  merge heads

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