From e9da335d70a895ad68a13cd8f1ccd3dc13fb596f Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 5 Jun 2020 11:26:56 +0200 Subject: [PATCH] intel: fix gen_sort_tags.py The script was failing for me (python 3.8), not sure if this is a recent python version break or not as I don't know how often people have been running this script: Processing ./gen9.xml... Traceback (most recent call last): File "./gen_sort_tags.py", line 177, in main() File "./gen_sort_tags.py", line 170, in main genxml[:] = enums + sorted_structs.values() + instructions + registers TypeError: can only concatenate list (not "odict_values") to list Turning the odict into a list fixes it for me, and the resulting xml file are identical to before :) Fixes: 903e142f0d35bc550ffd ("genxml: add a sorting script") Signed-off-by: Eric Engestrom Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 981d07c74a1611d8c308a96f59899fff66674c1a) --- .pick_status.json | 2 +- src/intel/genxml/gen_sort_tags.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d4113a86020..8158809127e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1093,7 +1093,7 @@ "description": "intel: fix gen_sort_tags.py", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "903e142f0d35bc550ffde321987a5b6fca1095eb" }, diff --git a/src/intel/genxml/gen_sort_tags.py b/src/intel/genxml/gen_sort_tags.py index 66b1011cef0..ea6b6d4158b 100644 --- a/src/intel/genxml/gen_sort_tags.py +++ b/src/intel/genxml/gen_sort_tags.py @@ -167,7 +167,7 @@ def main(): for r in registers: r[:] = sorted(r.getchildren(), key=get_start) - genxml[:] = enums + sorted_structs.values() + instructions + registers + genxml[:] = enums + list(sorted_structs.values()) + instructions + registers print('') print_node(sys.stdout, 0, genxml)