From 4a503e35a1261fa05f0e279f42f06fa05d9bd9e2 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 5 Jun 2020 00:36:55 -0700 Subject: [PATCH] intel/genxml: Migrate from deprecated xml.etree.ElementTree getchildren. xml.etree.ElementTree getchildren was deprecated since Python 2.7 and will be removed in Python 3.9. Signed-off-by: Vinson Lee Reviewed-by: Eric Engestrom Part-of: (cherry picked from commit 6a841dbf4e4f0cb33bc36a8ba880a9bd6f6e7941) --- .pick_status.json | 2 +- src/intel/genxml/gen_sort_tags.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8158809127e..d0498e57020 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -931,7 +931,7 @@ "description": "intel/genxml: Migrate from deprecated xml.etree.ElementTree getchildren.", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/intel/genxml/gen_sort_tags.py b/src/intel/genxml/gen_sort_tags.py index ea6b6d4158b..b07f8a830d8 100644 --- a/src/intel/genxml/gen_sort_tags.py +++ b/src/intel/genxml/gen_sort_tags.py @@ -65,7 +65,7 @@ def add_struct_refs(items, node): return if node.tag != 'struct' and node.tag != 'group': return - for c in node.getchildren(): + for c in node: add_struct_refs(items, c) @@ -115,7 +115,7 @@ def print_node(f, offset, node): for a in attribs: if a in node.attrib: f.write(' {0}="{1}"'.format(a, node.attrib[a])) - children = node.getchildren() + children = list(node) if len(children) > 0: f.write('>\n') for c in children: @@ -138,7 +138,7 @@ def main(): enum_dict = {} for e in enums: values = e.findall('./value') - e[:] = sorted(e.getchildren(), key=get_value) + e[:] = sorted(e, key=get_value) enum_dict[e.attrib['name']] = e # Structs are a bit annoying because they can refer to each other. We sort @@ -147,7 +147,7 @@ def main(): structs = sorted(xml.findall('./struct'), key=get_name) wrapped_struct_dict = {} for s in structs: - s[:] = sorted(s.getchildren(), key=get_start) + s[:] = sorted(s, key=get_start) ws = Struct(s) wrapped_struct_dict[ws.name] = ws @@ -161,11 +161,11 @@ def main(): instructions = sorted(xml.findall('./instruction'), key=get_name) for i in instructions: - i[:] = sorted(i.getchildren(), key=get_start) + i[:] = sorted(i, key=get_start) registers = sorted(xml.findall('./register'), key=get_name) for r in registers: - r[:] = sorted(r.getchildren(), key=get_start) + r[:] = sorted(r, key=get_start) genxml[:] = enums + list(sorted_structs.values()) + instructions + registers