mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #16324: _charset parameter of MIMEText now also accepts email.charset.Charset instances.

Browse source 
Initial patch by Claude Paroz.
This commit is contained in:
Berker Peksag 2014-09-27 00:57:29 +03:00
parent 081bbf6b28
commit fe21e4d4d7
5 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Doc/library/email.mime.rst
View file

@ -195,7 +195,8 @@ Here are the classes:
set of the text and is passed as an argument to the
:class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults
to ``us-ascii`` if the string contains only ``ascii`` codepoints, and
``utf-8`` otherwise.
``utf-8`` otherwise. The *_charset* parameter accepts either a string or a
:class:`~email.charset.Charset` instance.
Unless the *_charset* argument is explicitly set to ``None``, the
MIMEText object created will have both a :mailheader:`Content-Type` header
@ -206,3 +207,6 @@ Here are the classes:
``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).
.. versionchanged:: 3.5
*_charset* also accepts :class:`~email.charset.Charset` instances.