From fea331226ed0d760ab2d0e86650d62dd32230cd6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 3 Sep 2011 10:09:01 -0700 Subject: xml/metadata: handle py 3.1 cElementTree incompat This will fix bug #381657. --- pym/portage/xml/metadata.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/portage/xml') diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py index f4b8f2d37..04112cddc 100644 --- a/pym/portage/xml/metadata.py +++ b/pym/portage/xml/metadata.py @@ -32,9 +32,10 @@ __all__ = ('MetaDataXML',) import sys -if sys.hexversion < 0x2070000: +if sys.hexversion < 0x2070000 or \ + (sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000): # Our _MetadataTreeBuilder usage is incompatible with - # cElementTree in Python 2.6: + # cElementTree in Python 2.6, 3.0, and 3.1: # 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 -- cgit v1.2.3-1-g7c22