diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-07-10 15:01:04 -0400 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-07-10 15:01:04 -0400 |
| commit | 734f72ee7418cba987462a799d3d288cb8d95bf0 (patch) | |
| tree | 05763c29f4db8a83dcec5b03e4a1dadaf51f3881 /QMTest | |
| parent | 3010c84879e38755f90e317904e0bfb98d49f99c (diff) | |
| download | scons-734f72ee7418cba987462a799d3d288cb8d95bf0.tar.gz | |
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 00d61d32..0aab9a86 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 |