summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-01-29 14:38:55 (GMT)
committerGeorg Brandl <georg@python.org>2012-01-29 14:38:55 (GMT)
commit9e312dabdba58b4c97840070228f1af16b5b13fe (patch)
tree6492f86e15a1d8d08ef636dd8832dd5d0dd7df3d
parentdf13b5fae13f0a4aa9689d0873bc433960129a0c (diff)
parentc875d2032bf363da5e9e50928330f5ee2aa2fda2 (diff)
downloadcpython-9e312dabdba58b4c97840070228f1af16b5b13fe.zip
cpython-9e312dabdba58b4c97840070228f1af16b5b13fe.tar.gz
cpython-9e312dabdba58b4c97840070228f1af16b5b13fe.tar.bz2
merge with 3.2
-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 e70b429..a0303a4 100644
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -141,7 +141,9 @@ have the same API as the :class:`Parser` and :class:`BytesParser` classes.
data or by a blank line. Following the header block is the body of the
message (which may contain MIME-encoded subparts).
- Optional *headersonly* is as with the :meth:`parse` method.
+ Optional *headersonly* is a flag specifying whether to stop parsing after
+ reading the headers or not. The default is ``False``, meaning it parses
+ the entire contents of the file.
.. method:: parsestr(text, headersonly=False)
@@ -150,9 +152,7 @@ have the same API as the :class:`Parser` and :class:`BytesParser` classes.
equivalent to wrapping *text* in a :class:`~io.StringIO` instance first and
calling :meth:`parse`.
- Optional *headersonly* is a flag specifying whether to stop parsing after
- reading the headers or not. The default is ``False``, meaning it parses
- the entire contents of the file.
+ Optional *headersonly* is as with the :meth:`parse` method.
.. class:: BytesParser(_class=email.message.Message, *, policy=policy.default)