[Python-checkins] cpython (merge 3.6 -> default): merge 3.6

[benjamin.peterson]

https://hg.python.org/cpython/rev/651922ea92b0
changeset:   104546:651922ea92b0
parent:      104544:554fb699af8c
parent:      104545:ce0c96fd6b4c
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Oct 18 23:14:16 2016 -0700
summary:
  merge 3.6

files:
  Doc/library/email.parser.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -92,7 +92,7 @@
    .. 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 @@
    .. 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 @@
 
    .. 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 @@
 
    .. 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

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