From: Tom Tromey <tromey@adacore.com>
Date: Tue, 19 Mar 2024 16:24:41 +0000 (-0600)
Subject: Fix flake8 errors in dap/server.py
X-Git-Tag: gdb-15-branchpoint~539
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fde5149d735c9a7faf3efc0fc38e47744263466;p=thirdparty%2Fbinutils-gdb.git

Fix flake8 errors in dap/server.py

Commit 032d23a6 ("Fix stray KeyboardInterrupt after cancel")
introduced some errors into dap/server.py.  A function is called but
not imported, and the wrong variable name is used.  This patch
corrects both errors.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/gdb/python/lib/gdb/dap/server.py b/gdb/python/lib/gdb/dap/server.py
index cba5a308ff1..70646f4d75c 100644
--- a/gdb/python/lib/gdb/dap/server.py
+++ b/gdb/python/lib/gdb/dap/server.py
@@ -32,6 +32,7 @@ from .startup import (
     log,
     log_stack,
     LogLevel,
+    thread_log,
 )
 from .typecheck import type_check
 
@@ -478,7 +479,7 @@ class Cancellable(object):
                 pass
             else:
                 # Exception happened.  Ignore and log it.
-                err_string = "%s, %s" % (err, type(err))
+                err_string = "%s, %s" % (e, type(e))
                 thread_log("caught exception: " + err_string)
                 log_stack()