Skip to content

Commit 87df07c

Browse files
committed
Lib/pty.py: handle stdin I/O errors same way as master I/O errors
reading stdin can throw the same I/O errors as reading from master fd does, e.g. when running under Yocto's test harness: ====================================================================== ERROR: test_spawn_doesnt_hang (test.test_pty.PtyTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/lib/python3.10/test/test_pty.py", line 316, in test_spawn_doesnt_hang pty.spawn([sys.executable, '-c', 'print("hi there")']) File "/usr/lib/python3.10/pty.py", line 181, in spawn _copy(master_fd, master_read, stdin_read) File "/usr/lib/python3.10/pty.py", line 157, in _copy data = stdin_read(STDIN_FILENO) File "/usr/lib/python3.10/pty.py", line 132, in _read return os.read(fd, 1024) OSError: [Errno 5] Input/output error So let's treat both channels the same. Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 parent 7dacb70 commit 87df07c

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎Lib/pty.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
154154
os.write(STDOUT_FILENO, data)
155155

156156
if STDIN_FILENO in rfds:
157-
data = stdin_read(STDIN_FILENO)
157+
try:
158+
data = stdin_read(STDIN_FILENO)
159+
except OSError:
160+
data = b""
158161
if not data:
159162
fds.remove(STDIN_FILENO)
160163
else:

0 commit comments

Comments
 (0)