Staging
v0.5.1
Revision 1058cda38f1b409c4d52eef236f4915df592a112 authored by R David Murray on 29 March 2015, 19:15:40 UTC, committed by R David Murray on 29 March 2015, 19:15:40 UTC
Previously, if you hit ctl-c while the pager was active, the python that
launched the subprocess for the pager would see the KeyboardInterrupt in the
__exit__ method of the subprocess context manager where it was waiting for the
subprocess to complete, ending the wait.  This would leave the pager running,
while the interactive interpreter, after handling the exception by printing
it, would go back to trying to post a prompt...but the pager would generally
have the terminal in raw mode, and in any case would be still trying to read
from stdin.  On some systems, even exiting python at that point would not
restore the terminal mode.  The problem with raw mode could also happen if
ctl-C was hit when pydoc was called from the shell command line and the pager
was active.

Instead, we now wait on the subprocess in a loop, ignoring KeyboardInterrupt
just like the pager does, until the pager actually exits.

(Note: this was a regression relative to python2...in python2 the pager
is called via system, and system does not return until the pager exits.)
1 parent 48070c1
History
File Mode Size
Python-ast.c -rw-r--r-- 223.6 KB
_warnings.c -rw-r--r-- 30.6 KB
asdl.c -rw-r--r-- 1.4 KB
ast.c -rw-r--r-- 117.3 KB
bltinmodule.c -rw-r--r-- 74.8 KB
ceval.c -rw-r--r-- 147.3 KB
ceval_gil.h -rw-r--r-- 8.9 KB
codecs.c -rw-r--r-- 39.7 KB
compile.c -rw-r--r-- 124.8 KB
condvar.h -rw-r--r-- 11.0 KB
dtoa.c -rw-r--r-- 81.3 KB
dup2.c -rw-r--r-- 705 bytes
dynamic_annotations.c -rw-r--r-- 6.6 KB
dynload_aix.c -rw-r--r-- 5.6 KB
dynload_dl.c -rw-r--r-- 509 bytes
dynload_hpux.c -rw-r--r-- 1.8 KB
dynload_next.c -rw-r--r-- 3.8 KB
dynload_shlib.c -rw-r--r-- 3.3 KB
dynload_stub.c -rw-r--r-- 186 bytes
dynload_win.c -rw-r--r-- 9.5 KB
errors.c -rw-r--r-- 30.5 KB
fileutils.c -rw-r--r-- 27.7 KB
formatter_unicode.c -rw-r--r-- 48.7 KB
frozen.c -rw-r--r-- 1.6 KB
frozenmain.c -rw-r--r-- 2.7 KB
future.c -rw-r--r-- 4.6 KB
getargs.c -rw-r--r-- 53.7 KB
getcompiler.c -rw-r--r-- 366 bytes
getcopyright.c -rw-r--r-- 511 bytes
getopt.c -rw-r--r-- 3.4 KB
getplatform.c -rw-r--r-- 130 bytes
getversion.c -rw-r--r-- 289 bytes
graminit.c -rw-r--r-- 41.3 KB
import.c -rw-r--r-- 64.7 KB
importdl.c -rw-r--r-- 3.6 KB
importdl.h -rw-r--r-- 544 bytes
importlib.h -rw-r--r-- 226.5 KB
makeopcodetargets.py -rwxr-xr-x 1.2 KB
marshal.c -rw-r--r-- 47.7 KB
modsupport.c -rw-r--r-- 14.1 KB
mysnprintf.c -rw-r--r-- 3.3 KB
mystrtoul.c -rw-r--r-- 8.1 KB
opcode_targets.h -rw-r--r-- 6.2 KB
peephole.c -rw-r--r-- 24.7 KB
pyarena.c -rw-r--r-- 5.5 KB
pyctype.c -rw-r--r-- 7.7 KB
pyfpe.c -rw-r--r-- 623 bytes
pyhash.c -rw-r--r-- 13.0 KB
pymath.c -rw-r--r-- 1.5 KB
pystate.c -rw-r--r-- 25.2 KB
pystrcmp.c -rw-r--r-- 613 bytes
pystrtod.c -rw-r--r-- 38.2 KB
pythonrun.c -rw-r--r-- 83.5 KB
pytime.c -rw-r--r-- 6.5 KB
random.c -rw-r--r-- 8.4 KB
sigcheck.c -rw-r--r-- 529 bytes
strdup.c -rw-r--r-- 247 bytes
structmember.c -rw-r--r-- 8.7 KB
symtable.c -rw-r--r-- 55.5 KB
sysmodule.c -rw-r--r-- 62.5 KB
thread.c -rw-r--r-- 12.4 KB
thread_foobar.h -rw-r--r-- 1.4 KB
thread_nt.h -rw-r--r-- 10.3 KB
thread_pthread.h -rw-r--r-- 17.2 KB
traceback.c -rw-r--r-- 18.4 KB

back to top