Issue #25047: Merge Element Tree encoding from 3.4 into 3.5

author Martin Panter <vadmium+py@gmail.com>

Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)
author Martin Panter <vadmium+py@gmail.com>
Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)
diff --cc Lib/test/test_xml_etree.py
Simple merge
diff --cc Lib/xml/etree/ElementTree.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Wed, 23 Sep 2015 01:43:08 +0000 (01:43 +0000)
		1	2
Lib/test/test_xml_etree.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/xml/etree/ElementTree.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history