diff options
author | R David Murray <rdmurray@bitdance.com> | 2011-04-18 20:00:47 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2011-04-18 20:00:47 (GMT) |
commit | 6a45d3b6ae46291a2ee6d07fe67f5603cf8a1515 (patch) | |
tree | af5cd1ac4be543574999aee2ed271931047075fe /Doc/library/email.parser.rst | |
parent | 1f056b248a6f30d7a9b3ae265e24c9a7e8dc2711 (diff) | |
download | cpython-6a45d3b6ae46291a2ee6d07fe67f5603cf8a1515.zip cpython-6a45d3b6ae46291a2ee6d07fe67f5603cf8a1515.tar.gz cpython-6a45d3b6ae46291a2ee6d07fe67f5603cf8a1515.tar.bz2 |
Markup and text fixes from Georg Brandl's review.
Diffstat (limited to 'Doc/library/email.parser.rst')
-rw-r--r-- | Doc/library/email.parser.rst | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst index c5e43a9..e70b429 100644 --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -211,16 +211,19 @@ in the top-level :mod:`email` package namespace. ``Parser().parsestr(s)``. *_class* and *policy* are interpreted as with the :class:`Parser` class constructor. - .. versionchanged:: removed *strict*, added *policy* + .. versionchanged:: 3.3 + Removed the *strict* argument. Added the *policy* keyword. -.. function:: message_from_bytes(s, _class=email.message.Message, strict=None) +.. function:: message_from_bytes(s, _class=email.message.Message, *, \ + policy=policy.default) Return a message object structure from a byte string. This is exactly equivalent to ``BytesParser().parsebytes(s)``. Optional *_class* and *strict* are interpreted as with the :class:`Parser` class constructor. .. versionadded:: 3.2 - .. versionchanged:: 3.3 removed *strict*, added *policy* + .. versionchanged:: 3.3 + Removed the *strict* argument. Added the *policy* keyword. .. function:: message_from_file(fp, _class=email.message.Message, *, \ policy=policy.default) @@ -229,7 +232,8 @@ in the top-level :mod:`email` package namespace. This is exactly equivalent to ``Parser().parse(fp)``. *_class* and *policy* are interpreted as with the :class:`Parser` class constructor. - .. versionchanged:: 3.3 removed *strict*, added *policy* + .. versionchanged:: + Removed the *strict* argument. Added the *policy* keyword. .. function:: message_from_binary_file(fp, _class=email.message.Message, *, \ policy=policy.default) @@ -240,7 +244,8 @@ in the top-level :mod:`email` package namespace. class constructor. .. versionadded:: 3.2 - .. versionchanged:: 3.3 removed *strict*, added *policy* + .. versionchanged:: 3.3 + Removed the *strict* argument. Added the *policy* keyword. Here's an example of how you might use this at an interactive Python prompt:: |