[Python-checkins] cpython (merge 3.5 -> default): Merge Element Tree doc string from 3.5

Sat Jun 4 03:15:59 EDT 2016

https://hg.python.org/cpython/rev/8428d15cbeff
changeset: 101694:8428d15cbeff
parent: 101692:042c19239da6
parent: 101693:833fb1ab68e3
user: Martin Panter <vadmium+py at gmail.com>
date: Sat Jun 04 07:13:38 2016 +0000
summary:
 Merge Element Tree doc string from 3.5
files:
 Lib/xml/etree/ElementTree.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1424,7 +1424,7 @@
 class XMLParser:
 """Element structure builder for XML source data based on the expat parser.
 
- *html* are predefined HTML entities (not supported currently),
+ *html* are predefined HTML entities (deprecated and not supported),
 *target* is an optional target object which defaults to an instance of the
 standard TreeBuilder class, *encoding* is an optional encoding string
 which if given, overrides the encoding specified in the XML file:
-- 
Repository URL: https://hg.python.org/cpython
