git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From f8a664cf1fc73e381d57d6927207286059744837 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex@linutronix.de>
   3 Date: Thu, 16 Sep 2021 16:35:37 +0200
   4 Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
   5  errors
   6
   7 reading stdin can throw the same I/O errors as reading from master fd does,
   8 e.g. when running under Yocto's test harness:
   9 ======================================================================
  10 ERROR: test_spawn_doesnt_hang (test.test_pty.PtyTest)
  11 ----------------------------------------------------------------------
  12 Traceback (most recent call last):
  13   File "/usr/lib/python3.10/test/test_pty.py", line 316, in test_spawn_doesnt_hang
  14     pty.spawn([sys.executable, '-c', 'print("hi there")'])
  15   File "/usr/lib/python3.10/pty.py", line 181, in spawn
  16     _copy(master_fd, master_read, stdin_read)
  17   File "/usr/lib/python3.10/pty.py", line 157, in _copy
  18     data = stdin_read(STDIN_FILENO)
  19   File "/usr/lib/python3.10/pty.py", line 132, in _read
  20     return os.read(fd, 1024)
  21 OSError: [Errno 5] Input/output error
  22
  23 So let's treat both channels the same.
  24
  25 Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
  26 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  27
  28 ---
  29  Lib/pty.py | 5 ++++-
  30  1 file changed, 4 insertions(+), 1 deletion(-)
  31
  32 diff --git a/Lib/pty.py b/Lib/pty.py
  33 index 1d97994..fa8821b 100644
  34 --- a/Lib/pty.py
  35 +++ b/Lib/pty.py
  36 @@ -178,7 +178,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
  37              i_buf = i_buf[n:]
  38
  39          if stdin_avail and STDIN_FILENO in rfds:
  40 -            data = stdin_read(STDIN_FILENO)
  41 +            try:
  42 +                data = stdin_read(STDIN_FILENO)
  43 +            except OSError:
  44 +                data = b""
  45              if not data:
  46                  stdin_avail = False
  47              else: