diff options
| author | Tom Tromey <tom@tromey.com> | 2018-12-25 12:38:01 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-12-27 13:34:39 -0700 |
| commit | bc543c902f9891f732be68817e16ff379b69566e (patch) | |
| tree | f7efae208fc1ffdb36ba601b33905652550523a6 /gdb/python | |
| parent | 6ef2312a177ebdfa841e82b515c144975073a501 (diff) | |
| download | gdb-bc543c902f9891f732be68817e16ff379b69566e.zip gdb-bc543c902f9891f732be68817e16ff379b69566e.tar.gz gdb-bc543c902f9891f732be68817e16ff379b69566e.tar.bz2 | |
Translate PyExc_KeyboardInterrupt to gdb "quit"
A while back I typed "info pretty-printers" with a large number of
printers installed, and I typed "q" to stop the pagination. I noticed
that gdb printed a Python exception in this case.
It seems to me that, instead, quitting pagination (or control-c'ing a
Python command generally) should be handled the same way that gdb
normally handles a quit.
This patch implements this idea by changing gdbpy_handle_exception to
treat PyExc_KeyboardInterrupt specially.
gdb/ChangeLog
2018-12-27 Tom Tromey <tom@tromey.com>
* python/py-utils.c (gdbpy_handle_exception): Translate
PyExc_KeyboardInterrupt to quit.
gdb/testsuite/ChangeLog
2018-12-27 Tom Tromey <tom@tromey.com>
* gdb.python/py-cmd.exp (test_python_inline_or_multiline): Add
pagination test.
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/py-utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index e0aedb5..a587644 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -422,7 +422,9 @@ gdbpy_handle_exception () for user errors. However, a missing message for gdb.GdbError exceptions is arguably a bug, so we flag it as such. */ - if (! PyErr_GivenExceptionMatches (ptype, gdbpy_gdberror_exc) + if (PyErr_GivenExceptionMatches (ptype, PyExc_KeyboardInterrupt)) + throw_quit ("Quit"); + else if (! PyErr_GivenExceptionMatches (ptype, gdbpy_gdberror_exc) || msg == NULL || *msg == '\0') { PyErr_Restore (ptype, pvalue, ptraceback); |