From 8195191489dfe05224b44344a75c850ec0790488 Mon Sep 17 00:00:00 2001 From: Will Xyen L Date: Tue, 20 Jun 2017 06:46:34 -0400 Subject: [PATCH] Save attributes after node contents --- bin_xml.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bin_xml.py b/bin_xml.py index 61d2507..9c5a60c 100644 --- a/bin_xml.py +++ b/bin_xml.py @@ -174,17 +174,6 @@ class kbinxml(): self.nodeBuf.append_u8(len(name)) self.pack_bits(name) - import operator - sorted_x = sorted(node.attributes.items(), key=operator.itemgetter(0)) - for key, value in sorted_x:#node.attributes.items(): - if key in ['__type', '__size', '__count']: - pass - else: - self.data_append_string(value) - self.nodeBuf.append_u8(xml_types['attr']) - self.nodeBuf.append_u8(len(key)) - self.pack_bits(key) - if nodeType != 'void': fmt = xml_formats[nodeId] @@ -204,6 +193,17 @@ class kbinxml(): else: self.data_append_aligned(data, fmt['type'], fmt['count']) + import operator + sorted_x = sorted(node.attributes.items(), key=operator.itemgetter(0)) + for key, value in sorted_x:#node.attributes.items(): + if key in ['__type', '__size', '__count']: + pass + else: + self.data_append_string(value) + self.nodeBuf.append_u8(xml_types['attr']) + self.nodeBuf.append_u8(len(key)) + self.pack_bits(key) + for child in node.childNodes: if child.nodeType != child.TEXT_NODE: self._node_to_binary(child)