From: Ezio Melotti Date: Wed, 20 Mar 2013 11:54:18 +0000 (+0200) Subject: Merge usage of argument/parameter and markup fixes from 3.2. X-Git-Tag: v3.3.1rc1~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba7dd670cb5e4aa9c00c0e5347c53a46b3ec110a;p=python Merge usage of argument/parameter and markup fixes from 3.2. --- ba7dd670cb5e4aa9c00c0e5347c53a46b3ec110a diff --cc Doc/library/email.mime.rst index acaba1ce40,d6addc8287..192e353c2b --- a/Doc/library/email.mime.rst +++ b/Doc/library/email.mime.rst @@@ -183,12 -183,11 +183,12 @@@ Here are the classes :class:`MIMEText` class is used to create MIME objects of major type :mimetype:`text`. *_text* is the string for the payload. *_subtype* is the minor type and defaults to :mimetype:`plain`. *_charset* is the character - set of the text and is passed as a parameter to the + set of the text and is passed as an argument to the :class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults - to ``us-ascii``. + to ``us-ascii`` if the string contains only ``ascii`` codepoints, and + ``utf-8`` otherwise. - Unless the ``_charset`` parameter is explicitly set to ``None``, the + Unless the *_charset* argument 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