diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-03 10:09:01 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-03 10:09:01 -0700 |
| commit | fea331226ed0d760ab2d0e86650d62dd32230cd6 (patch) | |
| tree | 1cd1292f285600fd9a83b9a5b50979230382ff5a /pym/portage/xml | |
| parent | 7455c3845f0d0960af2194fdc4917c556fe7b04c (diff) | |
| download | portage-fea331226ed0d760ab2d0e86650d62dd32230cd6.tar.gz portage-fea331226ed0d760ab2d0e86650d62dd32230cd6.tar.bz2 portage-fea331226ed0d760ab2d0e86650d62dd32230cd6.zip | |
xml/metadata: handle py 3.1 cElementTree incompat
This will fix bug #381657.
Diffstat (limited to 'pym/portage/xml')
| -rw-r--r-- | pym/portage/xml/metadata.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 |