mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
321943e627
Changelog: https://docs.python.org/release/3.12.8/whatsnew/changelog.html#python-3-12-8 (From OE-Core rev: db5081254adacf6c87269fd43af7199267ad535c) Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From bbfb7fdf01f0502c7bf3d418f3a912ea76c93f24 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
|
Date: Thu, 16 Sep 2021 16:35:37 +0200
|
|
Subject: [PATCH] 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.
|
|
|
|
Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
Lib/pty.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Lib/pty.py b/Lib/pty.py
|
|
index 1d97994..fa8821b 100644
|
|
--- a/Lib/pty.py
|
|
+++ b/Lib/pty.py
|
|
@@ -178,7 +178,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
|
|
i_buf = i_buf[n:]
|
|
|
|
if stdin_avail and STDIN_FILENO in rfds:
|
|
- data = stdin_read(STDIN_FILENO)
|
|
+ try:
|
|
+ data = stdin_read(STDIN_FILENO)
|
|
+ except OSError:
|
|
+ data = b""
|
|
if not data:
|
|
stdin_avail = False
|
|
else:
|