From: Tom Tromey <tromey@adacore.com>
Date: Thu, 3 Aug 2023 16:25:18 +0000 (-0600)
Subject: Remove f-string from DAP
X-Git-Tag: upstream/2.42~2027
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c9adb880eb1ed259007a376b305027d397948e8;p=platform%2Fupstream%2Fbinutils.git

Remove f-string from DAP

One more f-string snuck into the DAP code, in breakpoint.py.  Most of
them were removed here:

    https://sourceware.org/pipermail/gdb-patches/2023-June/200023.html

but I think this one landed after that patch.

While DAP only supports Python 3.5 and later, f-strings were added in
3.6, so remove this.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30708
---

diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py
index 0aab4f3..76ff129 100644
--- a/gdb/python/lib/gdb/dap/breakpoint.py
+++ b/gdb/python/lib/gdb/dap/breakpoint.py
@@ -352,7 +352,7 @@ def _catch_exception(filterId, **args):
     if filterId in ("assert", "exception", "throw", "rethrow", "catch"):
         cmd = "-catch-" + filterId
     else:
-        raise Exception(f"Invalid exception filterID: {filterId}")
+        raise Exception("Invalid exception filterID: " + str(filterId))
     result = gdb.execute_mi(cmd)
     # A little lame that there's no more direct way.
     for bp in gdb.breakpoints():