mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #26870: Close pty master in case of exception

Browse source
This commit is contained in:
Martin Panter 2016-05-15 03:05:36 +00:00
parent f0dbf7a6ab
commit 3712686956
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_readline.py
View file

@ -1,6 +1,7 @@
"""
Very minimal unittests for parts of the readline module.
"""
from contextlib import ExitStack
from errno import EIO
import os
import selectors
@ -123,7 +124,10 @@ def run_pty(script, input=b"dummy input\r"):
args = (sys.executable, '-c', script)
proc = subprocess.Popen(args, stdin=slave, stdout=slave, stderr=slave)
os.close(slave)
with proc, selectors.DefaultSelector() as sel:
with ExitStack() as cleanup:
cleanup.enter_context(proc)
cleanup.callback(os.close, master)
sel = cleanup.enter_context(selectors.DefaultSelector())
sel.register(master, selectors.EVENT_READ | selectors.EVENT_WRITE)
os.set_blocking(master, False)
while True:
@ -137,7 +141,6 @@ def run_pty(script, input=b"dummy input\r"):
raise
chunk = b""
if not chunk:
os.close(master)
return output
output.extend(chunk)
if events & selectors.EVENT_WRITE: