From e04c84191b790b7bddd179bc67337e4205b61f8e Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 30 Sep 2022 17:01:20 +1000 Subject: sb/execute: Fix incremental decoder with --dry-run Closes #4726 --- source-builder/sb/execute.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source-builder/sb/execute.py b/source-builder/sb/execute.py index bdab373..b491c47 100755 --- a/source-builder/sb/execute.py +++ b/source-builder/sb/execute.py @@ -182,7 +182,10 @@ class execute(object): if trace_threads: print('execute:_readthread: start') - decoder = codecs.getincrementaldecoder(sys.stdout.encoding)() + if sys.stdout.encoding is not None: + decoder = codecs.getincrementaldecoder(sys.stdout.encoding)() + else: + decoder = None count = 0 line = '' try: @@ -202,7 +205,7 @@ class execute(object): _output_line(line + '\n', exe, prefix, out, count) break # str and bytes are the same type in Python2 - if type(data) is not str and type(data) is bytes: + if decoder is not None and type(data) is not str and type(data) is bytes: data = decoder.decode(data) last_ch = data[-1] sd = (line + data).split('\n') -- cgit v1.2.3