From 874188e188992834737935a4be97dbb98c093433 Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Sun, 28 May 2017 15:23:30 -0700 Subject: PY2/3 handle stderr/stdout streams which are None --- QMTest/TestCmd.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'QMTest') diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 0e7bc514..e4c69a6e 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -1448,7 +1448,10 @@ class TestCmd(object): TODO: Do we need to pass universal newlines into this function? """ - if sys.version_info[0] == 3 and sys.version_info[1] < 6: + + if not stream: + return stream + elif sys.version_info[0] == 3 and sys.version_info[1] < 6: stream = stream.decode('utf-8') stream = stream.replace('\r\n', '\n') elif sys.version_info[0] == 2: -- cgit v1.2.1