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

Merge usage of argument/parameter and markup fixes from 3.2.

Browse source
This commit is contained in:
Ezio Melotti 2013-03-20 13:54:18 +02:00
commit ba7dd670cb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ Here are the classes:
this data can be decoded by the standard Python module :mod:`sndhdr`, then the this data can be decoded by the standard Python module :mod:`sndhdr`, then the
subtype will be automatically included in the :mailheader:`Content-Type` header. subtype will be automatically included in the :mailheader:`Content-Type` header.
Otherwise you can explicitly specify the audio subtype via the *_subtype* Otherwise you can explicitly specify the audio subtype via the *_subtype*
parameter. If the minor type could not be guessed and *_subtype* was not given, argument. If the minor type could not be guessed and *_subtype* was not given,
then :exc:`TypeError` is raised. then :exc:`TypeError` is raised.
Optional *_encoder* is a callable (i.e. function) which will perform the actual Optional *_encoder* is a callable (i.e. function) which will perform the actual
@ -142,7 +142,7 @@ Here are the classes:
this data can be decoded by the standard Python module :mod:`imghdr`, then the this data can be decoded by the standard Python module :mod:`imghdr`, then the
subtype will be automatically included in the :mailheader:`Content-Type` header. subtype will be automatically included in the :mailheader:`Content-Type` header.
Otherwise you can explicitly specify the image subtype via the *_subtype* Otherwise you can explicitly specify the image subtype via the *_subtype*
parameter. If the minor type could not be guessed and *_subtype* was not given, argument. If the minor type could not be guessed and *_subtype* was not given,
then :exc:`TypeError` is raised. then :exc:`TypeError` is raised.
Optional *_encoder* is a callable (i.e. function) which will perform the actual Optional *_encoder* is a callable (i.e. function) which will perform the actual
@ -183,12 +183,12 @@ Here are the classes:
:class:`MIMEText` class is used to create MIME objects of major type :class:`MIMEText` class is used to create MIME objects of major type
:mimetype:`text`. *_text* is the string for the payload. *_subtype* is the :mimetype:`text`. *_text* is the string for the payload. *_subtype* is the
minor type and defaults to :mimetype:`plain`. *_charset* is the character 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 :class:`~email.mime.nonmultipart.MIMENonMultipart` constructor; it defaults
to ``us-ascii`` if the string contains only ``ascii`` codepoints, and to ``us-ascii`` if the string contains only ``ascii`` codepoints, and
``utf-8`` otherwise. ``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 MIMEText object created will have both a :mailheader:`Content-Type` header
with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding` with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding`
header. This means that a subsequent ``set_payload`` call will not result header. This means that a subsequent ``set_payload`` call will not result