From ddfcc320ab740cd6ac30d70aaff7987dda25ee7f Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 29 Sep 2022 20:57:56 +1000 Subject: sb/execute: Use a decoder that maintains state aross blocks Update #4734 --- source-builder/sb/execute.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source-builder/sb/execute.py b/source-builder/sb/execute.py index 06f9b7d..f470aba 100755 --- a/source-builder/sb/execute.py +++ b/source-builder/sb/execute.py @@ -27,6 +27,7 @@ from __future__ import print_function import functools +import codecs import io import os import re @@ -181,6 +182,7 @@ class execute(object): if trace_threads: print('execute:_readthread: start') + decoder = codecs.getincrementaldecoder(sys.stdout.encoding)() count = 0 line = '' try: @@ -201,7 +203,7 @@ class execute(object): break # str and bytes are the same type in Python2 if type(data) is not str and type(data) is bytes: - data = data.decode(sys.stdout.encoding) + data = decoder.decode(data) last_ch = data[-1] sd = (line + data).split('\n') if last_ch != '\n': -- cgit v1.2.3