rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-10-15 02:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtemstoolkit/execute: Handle unicode input on python2

Browse Source 
- Allow unicode as a type on python2. The unicode type is not
  present on python3 so make the support conditional.
- Add some more diag prints to aid debugging.

Closes #3964
This commit is contained in:
Chris Johns
2020-03-30 09:55:02 +11:00
parent 753eb949b3
commit ca7b290f94
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtemstoolkit/execute.py
View File

@@ -139,12 +139,20 @@ class execute(object):
tmp = bytes('temp', sys.stdin.encoding)
except:
encoding = False
input_types = [str, bytes]
try:
# Unicode is not valid in python3, not added to the list
input_types += [unicode]
except:
pass
try:
while True:
if trace_threads:
print('execute:_writethread: call input', input)
lines = input()
if type(lines) == str or type(lines) == bytes:
if trace_threads:
print('execute:_writethread: input returned:', type(lines))
if type(lines) in input_types:
try:
if encoding:
lines = bytes(lines, sys.stdin.encoding)
@@ -216,6 +224,9 @@ class execute(object):
sd = sd[:-1]
if len(sd) > 0:
for l in sd:
if trace_threads:
print('execute:_readthread: output-line:',
count, type(l))
_output_line(l + '\n', exe, prefix, out, count)
count += 1
if count > 10: