diff options
author | Tom Tromey <tromey@adacore.com> | 2024-02-15 13:14:43 -0700 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2024-02-27 09:46:31 -0700 |
commit | a207f6b3a384897be1dab081a0a9a206593029de (patch) | |
tree | efd01c313bd5d3e926450662d0e799708a808198 /gdb/python/lib | |
parent | 8ee6f71b1a09f4077e22c840a16833518c56089a (diff) | |
download | gdb-a207f6b3a384897be1dab081a0a9a206593029de.zip gdb-a207f6b3a384897be1dab081a0a9a206593029de.tar.gz gdb-a207f6b3a384897be1dab081a0a9a206593029de.tar.bz2 |
Rewrite "python" command exception handling
The "python" command (and the Python implementation of the gdb
"source" command) does not handle Python exceptions in the same way as
other gdb-facing Python code. In particular, exceptions are turned
into a generic error rather than being routed through
gdbpy_handle_exception, which takes care of converting to 'quit' as
appropriate.
I think this was done this way because PyRun_SimpleFile and friends do
not propagate the Python exception -- they simply indicate that one
occurred.
This patch reimplements these functions to respect the general gdb
convention here. As a bonus, some Windows-specific code can be
removed, as can the _execute_file function.
The bulk of this change is tweaking the test suite to match the new
way that exceptions are displayed. These changes are largely
uninteresting. However, it's worth pointing out the py-error.exp
change. Here, the failure changes because the test changes the host
charset to something that isn't supported by Python. This then
results in a weird error in the new setup.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31354
Acked-By: Tom de Vries <tdevries@suse.de>
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Diffstat (limited to 'gdb/python/lib')
-rw-r--r-- | gdb/python/lib/gdb/__init__.py | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index ce8a6aa..cb3732e 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -127,33 +127,6 @@ def _execute_unwinders(pending_frame): return None -def _execute_file(filepath): - """This function is used to replace Python 2's PyRun_SimpleFile. - - Loads and executes the given file. - - We could use the runpy module, but its documentation says: - "Furthermore, any functions and classes defined by the executed code are - not guaranteed to work correctly after a runpy function has returned." - """ - globals = sys.modules["__main__"].__dict__ - set_file = False - # Set file (if not set) so that the imported file can use it (e.g. to - # access file-relative paths). This matches what PyRun_SimpleFile does. - if not hasattr(globals, "__file__"): - globals["__file__"] = filepath - set_file = True - try: - with open(filepath, "rb") as file: - # We pass globals also as locals to match what Python does - # in PyRun_SimpleFile. - compiled = compile(file.read(), filepath, "exec") - exec(compiled, globals, globals) - finally: - if set_file: - del globals["__file__"] - - # Convenience variable to GDB's python directory PYTHONDIR = os.path.dirname(os.path.dirname(__file__)) |