Merge: #23792: Ignore KeyboardInterrupt when the pydoc pager is active.
This commit is contained in:
commit
f375b0a4d5
13
Lib/pydoc.py
13
Lib/pydoc.py
|
@ -1450,11 +1450,18 @@ def pipepager(text, cmd):
|
|||
import subprocess
|
||||
proc = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE)
|
||||
try:
|
||||
with proc:
|
||||
with io.TextIOWrapper(proc.stdin, errors='backslashreplace') as pipe:
|
||||
pipe.write(text)
|
||||
with io.TextIOWrapper(proc.stdin, errors='backslashreplace') as pipe:
|
||||
pipe.write(text)
|
||||
except OSError:
|
||||
pass # Ignore broken pipes caused by quitting the pager program.
|
||||
while True:
|
||||
try:
|
||||
proc.wait()
|
||||
break
|
||||
except KeyboardInterrupt:
|
||||
# Ignore ctl-c like the pager itself does. Otherwise the pager is
|
||||
# left running and the terminal is in raw mode and unusable.
|
||||
pass
|
||||
|
||||
def tempfilepager(text, cmd):
|
||||
"""Page through text by invoking a program on a temporary file."""
|
||||
|
|
|
@ -30,6 +30,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #23792: Ignore KeyboardInterrupt when the pydoc pager is active.
|
||||
This mimics the behavior of the standard unix pagers, and prevents
|
||||
pipepager from shutting down while the pager itself is still running.
|
||||
|
||||
- Issue #23775: pprint() of OrderedDict now outputs the same representation
|
||||
as repr().
|
||||
|
||||
|
|
Loading…
Reference in New Issue