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

[gregory.p.smith]

http://hg.python.org/cpython/rev/2277e43fef8b
changeset:   82792:2277e43fef8b
branch:      3.2
parent:      82788:fa475953f183
parent:      82783:ba500b179c3a
user:        Gregory P. Smith <greg at krypto.org>
date:        Tue Mar 19 15:25:28 2013 -0700
summary:
  merge heads

files:
  Doc/library/email.mime.rst |  12 +++++++++++-
  1 files changed, 11 insertions(+), 1 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
@@ -185,5 +185,15 @@
    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).
+

-- 
Repository URL: http://hg.python.org/cpython