From: Georg Brandl <georg@python.org>
Date: Sun, 29 Jan 2012 14:38:55 +0000 (+0100)
Subject: merge with 3.2
X-Git-Tag: v3.3.0a1~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e312dabdba58b4c97840070228f1af16b5b13fe;p=python

merge with 3.2
---

9e312dabdba58b4c97840070228f1af16b5b13fe
diff --cc Doc/library/email.parser.rst
index e70b429b42,384c5c9ee0..a0303a4b6e
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@@ -150,12 -144,10 +152,10 @@@ have the same API as the :class:`Parser
        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, strict=None)
 +.. class:: BytesParser(_class=email.message.Message, *, policy=policy.default)
  
     This class is exactly parallel to :class:`Parser`, but handles bytes input.
     The *_class* and *strict* arguments are interpreted in the same way as for