commit: 00f37d58e986969c9eae5c647451a097c3d1c489 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Thu Sep 11 19:50:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 12 21:16:08 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=00f37d58
xml.metadata: Drop Python 2 compat code Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> Part-of: https://github.com/gentoo/portage/pull/1459 Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/xml/metadata.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py index 33bb977d7a..018c0f379f 100644 --- a/lib/portage/xml/metadata.py +++ b/lib/portage/xml/metadata.py @@ -246,11 +246,7 @@ class MetaDataXML: if herd in ("no-herd", "maintainer-wanted", "maintainer-needed"): return None - try: - # Python 2.7 or >=3.2 - iterate = self._herdstree.iter - except AttributeError: - iterate = self._herdstree.getiterator + iterate = self._herdstree.iter for node in iterate("herd"): if node.findtext("name") == herd: @@ -329,11 +325,7 @@ class MetaDataXML: if self._xml_tree is None: self._useflags = tuple() else: - try: - # Python 2.7 or >=3.2 - iterate = self._xml_tree.iter - except AttributeError: - iterate = self._xml_tree.getiterator + iterate = self._xml_tree.iter self._useflags = tuple(_Useflag(node) for node in iterate("flag")) return self._useflags
