diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-07-10 19:01:04 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-07-10 19:01:04 (GMT) |
commit | d2b59cc6d18e5d3139f623ab4285de34b3dd5596 (patch) | |
tree | 05763c29f4db8a83dcec5b03e4a1dadaf51f3881 /QMTest | |
parent | 0eaef4f2b8064882e7497695ba352c719b543dc8 (diff) | |
download | SCons-d2b59cc6d18e5d3139f623ab4285de34b3dd5596.zip SCons-d2b59cc6d18e5d3139f623ab4285de34b3dd5596.tar.gz SCons-d2b59cc6d18e5d3139f623ab4285de34b3dd5596.tar.bz2 |
py2/3 always convert stdin to bytes if py3. Previously was 3.5 only
Diffstat (limited to 'QMTest')
-rw-r--r-- | QMTest/TestCmd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 00d61d3..0aab9a8 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -1516,8 +1516,8 @@ class TestCmd(object): if is_List(stdin): stdin = ''.join(stdin) - if stdin and IS_PY3 and sys.version_info[1] < 6: - stdin = bytearray(stdin,'utf-8') + if stdin and IS_PY3:# and sys.version_info[1] < 6: + stdin = to_bytes(stdin) # TODO(sgk): figure out how to re-use the logic in the .finish() # method above. Just calling it from here causes problems with |