From 2ad6f45d835002abe7ed0a2facd524235fb3a9d8 Mon Sep 17 00:00:00 2001 From: Mark Edgeworth Date: Wed, 12 Feb 2020 14:56:35 +0000 Subject: [PATCH] Fix #12290: crash_log_parser on py3 --- tools/debug_tools/crash_log_parser/crash_log_parser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/debug_tools/crash_log_parser/crash_log_parser.py b/tools/debug_tools/crash_log_parser/crash_log_parser.py index 1114ffbb08..05e036ae05 100644 --- a/tools/debug_tools/crash_log_parser/crash_log_parser.py +++ b/tools/debug_tools/crash_log_parser/crash_log_parser.py @@ -32,8 +32,8 @@ _PTN = re.compile("([0-9a-f]*) ([Tt]) ([^\t\n]*)(?:\t(.*):([0-9]*))?") class ElfHelper(object): def __init__(self, elf_file, map_file): - - op = check_output([_NM_EXEC, _OPT, elf_file.name]) + + op = check_output([_NM_EXEC, _OPT, elf_file.name]).decode('utf-8') self.maplines = map_file.readlines() self.matches = _PTN.findall(op) self.addrs = [int(x[0], 16) for x in self.matches] @@ -115,8 +115,8 @@ def parse_line_for_register(line): def main(crash_log, elfhelper): mmfar_val = 0 bfar_val = 0 - lines = iter(crash_log.read().splitlines()) - + lines = iter(crash_log.read().decode('utf-8').splitlines()) + for eachline in lines: if "++ MbedOS Fault Handler ++" in eachline: break