fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/genxml: Migrate from deprecated xml.etree.ElementTree getchildren.

Browse source 
xml.etree.ElementTree getchildren was deprecated since Python 2.7 and
will be removed in Python 3.9.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5348>
(cherry picked from commit 6a841dbf4e)
This commit is contained in:
Vinson Lee 2020-06-05 00:36:55 -07:00 • committed by Eric Engestrom
parent e9da335d70
commit 4a503e35a1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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
},

12
src/intel/genxml/gen_sort_tags.py
View file

@ -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