summaryrefslogtreecommitdiffstats
path: root/Lib/xml
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-04 07:13:38 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-04 07:13:38 (GMT)
commit32eeb56f42b201f0c72a6a9ba64fd5eeda1da8db (patch)
tree6b18f9127356ba9c3f6afb16e6718a3ffe3d3b50 /Lib/xml
parent2cf6ca787a899a16896c2279364ff04150fc21b0 (diff)
parent29ce082c10abe32ff9e9991d42c244d4ab3101b7 (diff)
downloadcpython-32eeb56f42b201f0c72a6a9ba64fd5eeda1da8db.zip
cpython-32eeb56f42b201f0c72a6a9ba64fd5eeda1da8db.tar.gz
cpython-32eeb56f42b201f0c72a6a9ba64fd5eeda1da8db.tar.bz2
Merge Element Tree doc string from 3.5
Diffstat (limited to 'Lib/xml')
-rw-r--r--Lib/xml/etree/ElementTree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 50e42c8..67b7f2b 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1424,7 +1424,7 @@ class TreeBuilder:
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: