summaryrefslogtreecommitdiff
path: root/QMTest
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-02 16:48:15 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-02 16:48:15 -0800
commit2349f35f3a91afb9e078b30f6e2ab0831f6804c5 (patch)
treec7fc0948457f0f25598ebaa0477c4d17546ed4a0 /QMTest
parent455d3c9413e1a5ffa839a5eb7dad45a2ad392bc4 (diff)
downloadscons-2349f35f3a91afb9e078b30f6e2ab0831f6804c5.tar.gz
fix byte/str py2/3
Diffstat (limited to 'QMTest')
-rw-r--r--QMTest/TestCmd.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 370101bb..b97f1032 100644
--- a/QMTest/TestCmd.py
+++ b/QMTest/TestCmd.py
@@ -783,7 +783,7 @@ class Popen(subprocess.Popen):
return 0
try:
- written = os.write(self.stdin.fileno(), input)
+ written = os.write(self.stdin.fileno(), bytearray(input,'utf-8'))
except OSError as why:
if why.args[0] == errno.EPIPE: #broken pipe
return self._close('stdin')
@@ -1355,6 +1355,7 @@ class TestCmd(object):
if timeout:
self.timer = threading.Timer(float(timeout), self._timeout)
self.timer.start()
+ print("CMD:%s"%cmd)
p = Popen(cmd,
stdin=stdin,
stdout=subprocess.PIPE,