summaryrefslogtreecommitdiff
path: root/testing/framework/TestCmd.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 17:12:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-28 17:12:57 +0100
commit5fc601f5484c9463e3399c0e690db80b9c22386e (patch)
tree3574b43f98f25e7bbf9dfdcb3e90d54f23e8ae0c /testing/framework/TestCmd.py
parent10b9d3fe4386c06efbb4d971e4e307b89e254faa (diff)
parent56597a6a68e741355b301f91d5913d59cfb34eaa (diff)
Update upstream source from tag 'upstream/3.1.2'
Update to upstream version '3.1.2' with Debian dir 7ef381d8ee1bc3570b5feec63204df7f87ac1cb2
Diffstat (limited to 'testing/framework/TestCmd.py')
-rw-r--r--testing/framework/TestCmd.py2
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')