http://hg.python.org/cpython/rev/a273f6e101c6 changeset: 74677:a273f6e101c6 parent: 74674:aa214fefbdc1 parent: 74676:0d5667171356 user: Georg Brandl <georg@python.org> date: Sun Jan 29 15:38:55 2012 +0100 summary: merge with 3.2 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 @@ -141,7 +141,9 @@ 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 @@ 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) -- Repository URL: http://hg.python.org/cpython