diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:12:41 +0100 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-12-28 17:12:41 +0100 | 
| commit | 56597a6a68e741355b301f91d5913d59cfb34eaa (patch) | |
| tree | 7531e41faf62f126984bf05b8d712f99c9520d5d /testing/framework/TestCmd.py | |
| parent | 56337453f0f3fbe34255e636d5d65974f4d17681 (diff) | |
New upstream version 3.1.2upstream/3.1.2upstream
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')  | 
