feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/ci_stdout_encoding_v4.1' into 'release/v4.1'

Browse Source 
ci: Fix missing sys.stdout.encoding in python2 runners (v4.1)

See merge request espressif/esp-idf!12597
This commit is contained in:
Angus Gratton
2021-03-04 04:05:37 +00:00
parent d481781180 2c4f90dab2
commit ca9ff949a1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/ci/python_packages/tiny_test_fw/DUT.py
View File

@@ -81,10 +81,13 @@ def _decode_data(data):
if isinstance(data, bytes):
# convert bytes to string. This is a bit of a hack, we know that we want to log this
# later so encode to the stdout encoding with backslash escapes for anything non-encodable
encoding = sys.stdout.encoding
if encoding is None:
encoding = 'ascii'
try:
return data.decode(sys.stdout.encoding, "backslashreplace")
except UnicodeDecodeError: # Python <3.5 doesn't support backslashreplace
return data.decode(sys.stdout.encoding, "replace")
return data.decode(encoding, "backslashreplace")
except (UnicodeDecodeError, TypeError): # Python <3.5 doesn't support backslashreplace
return data.decode(encoding, "replace")
return data