| 1 |
commit: 517581df206766fabf10273cde565e0a6dc62829 |
| 2 |
Author: Mikk Margus Möll <mimoll <AT> ttu <DOT> ee> |
| 3 |
AuthorDate: Wed Oct 7 20:00:51 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 06:29:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df |
| 7 |
|
| 8 |
metadata: Drop deprecated ElementTree methods |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoolkit/pull/11 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
pym/gentoolkit/metadata.py | 9 ++++----- |
| 14 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py |
| 17 |
index 22c249e..c3dba98 100644 |
| 18 |
--- a/pym/gentoolkit/metadata.py |
| 19 |
+++ b/pym/gentoolkit/metadata.py |
| 20 |
@@ -73,8 +73,7 @@ class _Maintainer(object): |
| 21 |
self.description = None |
| 22 |
self.restrict = node.get('restrict') |
| 23 |
self.status = node.get('status') |
| 24 |
- maint_attrs = node.getchildren() |
| 25 |
- for attr in maint_attrs: |
| 26 |
+ for attr in node.iter(): |
| 27 |
setattr(self, attr.tag, attr.text) |
| 28 |
|
| 29 |
def __repr__(self): |
| 30 |
@@ -101,7 +100,7 @@ class _Useflag(object): |
| 31 |
_desc = '' |
| 32 |
if node.text: |
| 33 |
_desc = node.text |
| 34 |
- for child in node.getchildren(): |
| 35 |
+ for child in node.iter(): |
| 36 |
_desc += child.text if child.text else '' |
| 37 |
_desc += child.tail if child.tail else '' |
| 38 |
# This takes care of tabs and newlines left from the file |
| 39 |
@@ -213,7 +212,7 @@ class MetaData(object): |
| 40 |
if herd in ('no-herd', 'maintainer-wanted', 'maintainer-needed'): |
| 41 |
return None |
| 42 |
|
| 43 |
- for node in self._herdstree.getiterator('herd'): |
| 44 |
+ for node in self._herdstree.iter('herd'): |
| 45 |
if node.findtext('name') == herd: |
| 46 |
return node.findtext('email') |
| 47 |
|
| 48 |
@@ -283,7 +282,7 @@ class MetaData(object): |
| 49 |
return self._useflags |
| 50 |
|
| 51 |
self._useflags = [] |
| 52 |
- for node in self._xml_tree.getiterator('flag'): |
| 53 |
+ for node in self._xml_tree.iter('flag'): |
| 54 |
self._useflags.append(_Useflag(node)) |
| 55 |
|
| 56 |
return self._useflags |
Archives