summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-10-18 23:14:16 -0700
committerBenjamin Peterson <benjamin@python.org>2016-10-18 23:14:16 -0700
commitbb7d15c4f37807a657b53b28e357cc4130f78e67 (patch)
tree103fc9d41a9660e2cf693a85426938b13507a9b6
parent193a360570b63110dd11d059297dc0d18b57b95b (diff)
parentb17ba095f2815a386459bc9989ad7276f4f80a96 (diff)
downloadcpython-git-bb7d15c4f37807a657b53b28e357cc4130f78e67.tar.gz
merge 3.6
-rw-r--r--Doc/library/email.parser.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
index 2ac1f98e0b..c323ebc640 100644
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -92,7 +92,7 @@ Here is the API for the :class:`BytesFeedParser`:
.. versionadded:: 3.2
.. versionchanged:: 3.3 Added the *policy* keyword.
- .. versionchanged:: 3.6 _factory defaults to the policy ``message_factory``.
+ .. versionchanged:: 3.6 *_factory* defaults to the policy ``message_factory``.
.. method:: feed(data)
@@ -148,7 +148,7 @@ message body, instead setting the payload to the raw body.
.. versionchanged:: 3.3
Removed the *strict* argument that was deprecated in 2.4. Added the
*policy* keyword.
- .. versionchanged:: 3.6 _class defaults to the policy ``message_factory``.
+ .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``.
.. method:: parse(fp, headersonly=False)
@@ -197,7 +197,7 @@ message body, instead setting the payload to the raw body.
.. versionchanged:: 3.3
Removed the *strict* argument. Added the *policy* keyword.
- .. versionchanged:: 3.6 _class defaults to the policy ``message_factory``.
+ .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``.
.. method:: parse(fp, headersonly=False)
@@ -277,7 +277,7 @@ in the top-level :mod:`email` package namespace.
.. versionchanged:: 3.3
Removed the *strict* argument. Added the *policy* keyword.
- .. versionchanged:: 3.6 _class defaults to the policy ``message_factory``.
+ .. versionchanged:: 3.6 *_class* defaults to the policy ``message_factory``.
Here's an example of how you might use :func:`message_from_bytes` at an