merge with 3.5

This commit is contained in:
Georg Brandl 2016-02-26 19:14:56 +01:00
commit def4ff6a64

View file

@ -1044,16 +1044,16 @@ XMLParser Objects
This class is the low-level building block of the module. It uses This class is the low-level building block of the module. It uses
:mod:`xml.parsers.expat` for efficient, event-based parsing of XML. It can :mod:`xml.parsers.expat` for efficient, event-based parsing of XML. It can
be fed XML data incrementall with the :meth:`feed` method, and parsing events be fed XML data incrementally with the :meth:`feed` method, and parsing
are translated to a push API - by invoking callbacks on the *target* object. events are translated to a push API - by invoking callbacks on the *target*
If *target* is omitted, the standard :class:`TreeBuilder` is used. The object. If *target* is omitted, the standard :class:`TreeBuilder` is used.
*html* argument was historically used for backwards compatibility and is now The *html* argument was historically used for backwards compatibility and is
deprecated. If *encoding* [1]_ is given, the value overrides the encoding now deprecated. If *encoding* [1]_ is given, the value overrides the
specified in the XML file. encoding specified in the XML file.
.. deprecated:: 3.4 .. deprecated:: 3.4
The *html* argument. The remaining arguments should be passed via The *html* argument. The remaining arguments should be passed via
keywword to prepare for the removal of the *html* argument. keyword to prepare for the removal of the *html* argument.
.. method:: close() .. method:: close()