From 397469774fb16f29443db1566a2777fb23d2234e Mon Sep 17 00:00:00 2001 From: Timothy Sutton Date: Tue, 19 Dec 2017 09:42:04 -0500 Subject: [PATCH] Handle nested dict elem within auxinfo - this is present in 091-33271 (10.13.2, build 17C2120) --- installinstallmacos.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/installinstallmacos.py b/installinstallmacos.py index b75da14..5eadec1 100755 --- a/installinstallmacos.py +++ b/installinstallmacos.py @@ -218,7 +218,15 @@ def parse_dist(filename): auxinfo = auxinfos[0] key = None value = None - for node in auxinfo.childNodes: + children = auxinfo.childNodes + # handle the possibility that keys from auxinfo may be nested + # within a 'dict' element + dict_nodes = [n for n in auxinfo.childNodes + if n.nodeType == n.ELEMENT_NODE and + n.tagName == 'dict'] + if dict_nodes: + children = dict_nodes[0].childNodes + for node in children: if node.nodeType == node.ELEMENT_NODE and node.tagName == 'key': key = node.firstChild.wholeText if node.nodeType == node.ELEMENT_NODE and node.tagName == 'string':