Merge for Issue #18997: Issue #18997: fix ElementTree crash with using pickle and...

author Eli Bendersky <eliben@gmail.com>

Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)

committer Eli Bendersky <eliben@gmail.com>

Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)
author Eli Bendersky <eliben@gmail.com>
Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)
committer Eli Bendersky <eliben@gmail.com>
Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)
diff --cc Lib/test/test_xml_etree.py
Simple merge
diff --cc Misc/ACKS

index be488d63b800fe24765fec41ce9600297235a32f,9781600b2c06d8a49fd4285e22386e7da0dd75d7..17d2e75e59e67d3afd4da41e428785ad898892bd
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -154,10 -150,9 +154,11 @@@ Monty Brandenber
   Georg Brandl
   Christopher Brannon
   Terrence Brannon
+ Germán M. Bravo
+ +Sven Brauch
   Erik Bray
   Brian Brazil
+ +Demian Brecht
   Dave Brennan
   Tom Bridgman
   Anthony Briggs
diff --cc Modules/_elementtree.c
Simple merge
author	Eli Bendersky <eliben@gmail.com>
	Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)
committer	Eli Bendersky <eliben@gmail.com>
	Fri, 13 Sep 2013 13:27:52 +0000 (06:27 -0700)
		1	2
Lib/test/test_xml_etree.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/_elementtree.c	patch \|	diff1 \|	diff2 \|	blob \| history