diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-12-01 01:51:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 01:51:14 (GMT) |
| commit | 8c5dc5842501305cf152af8eda612bbc2c2f06dc (patch) | |
| tree | 983609091e65c6a348bfc78862146e4d3df4c303 /testing | |
| parent | 8c49f0a6748688f98b10f6bb9b3d244baa49b3e4 (diff) | |
| parent | 83303e4e9f655d0f3af5e7c369f84ec57daa756b (diff) | |
| download | SCons-8c5dc5842501305cf152af8eda612bbc2c2f06dc.zip SCons-8c5dc5842501305cf152af8eda612bbc2c2f06dc.tar.gz SCons-8c5dc5842501305cf152af8eda612bbc2c2f06dc.tar.bz2 | |
Merge branch 'master' into topic/grossag/pythonscanner
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestCmd.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py index 81e03f3..9218f60 100644 --- a/testing/framework/TestCmd.py +++ b/testing/framework/TestCmd.py @@ -1528,7 +1528,7 @@ class TestCmd(object): # TODO: Run full tests on both platforms and see if this fixes failures # It seems that py3.6 still sets text mode if you set encoding. elif sys.version_info[0] == 3: # TODO and sys.version_info[1] < 6: - stream = stream.decode('utf-8') + stream = stream.decode('utf-8', errors='replace') stream = stream.replace('\r\n', '\n') elif sys.version_info[0] == 2: stream = stream.replace('\r\n', '\n') |