ElementTree: use iter if available (bug #380565)

diff --git a/pym/portage/xml/metadata.py b/pym/portage/xml/metadata.py
index 7acc1f3d6bcb4a709ae4b58303dca40d38007cca..090d2c0b35ca8edab0959e174f0db4fb16f46fdd 100644 (file)
--- a/pym/portage/xml/metadata.py
+++ b/pym/portage/xml/metadata.py
@@ -217,7 +217,12 @@ class MetaDataXML(object):
                if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'):
                        return None
 
-               for node in self._herdstree.getiterator('herd'):
+               try:
+                       iterate = self._herdstree.iter
+               except AttributeError:
+                       iterate = self._herdstree.getiterator
+
+               for node in iterate('herd'):
                        if node.findtext('name') == herd:
                                return node.findtext('email')
 
@@ -292,8 +297,12 @@ class MetaDataXML(object):
                        if self._xml_tree is None:
                                self._useflags = tuple()
                        else:
+                               try:
+                                       iterate = self._xml_tree.iter
+                               except AttributeError:
+                                       iterate = self._xml_tree.getiterator
                                self._useflags = tuple(_Useflag(node) \
-                                       for node in self._xml_tree.getiterator('flag'))
+                                       for node in iterate('flag'))
 
                return self._useflags