[gentoo-commits] proj/portage:master commit in: pym/portage/xml/

[Zac Medico]

commit:     cfe7af2b1da9357d5bfaa531f288ef0ac074184c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 15:45:43 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 15:45:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cfe7af2b

xml/metadata: handle py 2.6 cElementTree incompat

---
 pym/portage/xml/metadata.py |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 9e18869..3513fff 100644
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -30,10 +30,19 @@
 
 __all__ = ('MetaDataXML',)
 
-try:
-	import xml.etree.cElementTree as etree
-except ImportError:
+import sys
+
+if sys.hexversion < 0x2070000:
+	# Our _MetadataTreeBuilder usage is incompatible with
+	# cElementTree in Python 2.6:
+	#  File "/usr/lib/python2.6/xml/etree/ElementTree.py", line 644, in findall
+    #    assert self._root is not None
 	import xml.etree.ElementTree as etree
+else:
+	try:
+		import xml.etree.cElementTree as etree
+	except ImportError:
+		import xml.etree.ElementTree as etree
 
 import re
 import xml.etree.ElementTree