From b65d64b90569e69e7d122dc90c8d00e33ce4a8da Mon Sep 17 00:00:00 2001 From: Martin Errenst Date: Sat, 28 Jul 2018 22:03:28 +0200 Subject: [PATCH] set python3 as default python interpreter, fix whitespace and encoding issues --- utils/filteroutput.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/utils/filteroutput.py b/utils/filteroutput.py index 5e9b1cf..dcbe65c 100755 --- a/utils/filteroutput.py +++ b/utils/filteroutput.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # A thin Python wrapper around addr2line, can monitor esp-open-rtos # output and uses gdb to convert any suitable looking hex numbers @@ -74,17 +74,17 @@ def main(): print("Reading from stdin...") port = sys.stdin # disable echo - try: + try: old_attr = termios.tcgetattr(sys.stdin.fileno()) - attr = termios.tcgetattr(sys.stdin.fileno()) - attr[3] = attr[3] & ~termios.ECHO - termios.tcsetattr(sys.stdin.fileno(), termios.TCSADRAIN, attr) - except termios.error: - pass + attr = termios.tcgetattr(sys.stdin.fileno()) + attr[3] = attr[3] & ~termios.ECHO + termios.tcsetattr(sys.stdin.fileno(), termios.TCSADRAIN, attr) + except termios.error: + pass try: while True: - line = port.readline() + line = port.readline().decode('ISO-8859-1') if line == '': break print(line.strip()) @@ -94,7 +94,8 @@ def main(): addr = "0x"+addr # keeping addr2line and feeding it addresses on stdin didn't seem to work smoothly addr2line = subprocess.check_output(["xtensa-lx106-elf-addr2line","-pfia","-e","%s" % args.elf, addr], cwd=".").strip() - if not addr2line.endswith(": ?? ??:0"): + pattern = ": ?? ??:0" + if not addr2line.endswith(pattern.encode()): print("\n%s\n" % addr2line.strip()) finally: if args.port is None: