diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:14:59 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:14:59 +0100 |
| commit | f01695e065adbca6531dbf3a28e8a707c49eba23 (patch) | |
| tree | 3574b43f98f25e7bbf9dfdcb3e90d54f23e8ae0c /testing/framework/TestCmd.py | |
| parent | 10b9d3fe4386c06efbb4d971e4e307b89e254faa (diff) | |
| parent | 5fc601f5484c9463e3399c0e690db80b9c22386e (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'testing/framework/TestCmd.py')
| -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') |