From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by sourceware.org (Postfix) with ESMTPS id 1130C3858D1E for ; Thu, 3 Aug 2023 16:27:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1130C3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-790a8c74383so40070439f.3 for ; Thu, 03 Aug 2023 09:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1691080051; x=1691684851; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+IZBOlzj2yhtGjzWPdB5XhD0ZsY2EQI+cuRglS7nXak=; b=RGaDqZ47g7SzxV3nXRQiJ6UqIAzzRb/O7t4u1nSU5WiP4ljzgdVmQNuuwdaOWkgiV7 vprISOU4yEbX6632Ut7oEaEeCFAp2Orw44vt7uSi/dXk8kfhANJKhAMMWKaKofUxAVHe e/fGqXHEEKpcEKlq88FGtdGH+06KnDjFJzBrqjlLcVXGuECU0OaG6gvuOLJZnmzUyOAU Lhl6G+wPHwurPB0fw4a39tGwbI6vraz/bfCDwDWzyM6aRDn0vm1bbLjhCIgJNXG9MUrs URnkM2bGwlad1ZDY6mPVdPT49H31Ndnw1oDtY36J/fBxQzq345sYIhsJ/8373UVjydJ5 vTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691080051; x=1691684851; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+IZBOlzj2yhtGjzWPdB5XhD0ZsY2EQI+cuRglS7nXak=; b=FoXDLFxLizavZeHg4/O5namAvIxWfyesfvNdO4SAgwQsC5CEhEchK+ed+IpNwsmcRY wpfEGwQSqbHRLI8M7lIBzjkUu393LVKRFAnM1julHhpJHGXztHfW1CaZVJr0S3MAUc76 EByAxNo+eDwNau1AMwij1pyTUPkvmDHYYLik/IiG/HMBQPLt5QXW1IgCt4GP88qOxZts R4DKev1oAxIpHfcK/LFpyjYskn/Fyzrlah/klUiAXnBdBEnyItq/9VkP++jWVKM02xPh c0zAn1ivGi16Tjuc5VShu9pMAhNMoXvp1+uFSYtsh10a6MuIDUD38YP437XEkZeoi3o6 GYkw== X-Gm-Message-State: ABy/qLZFlHp3ZgiGkOgYQ/GPmlOmxPgXu1xXA0Dg5SRZk8AFizbjq6Mw i9PbmYCiOO0BKPRx6G6aBLPttiAd9vkSQevrVNl/uQ== X-Google-Smtp-Source: APBJJlH571AqhmDeB+UfSf3ZyHk9xboi47+NSPHgIpERg+zSbi+7K6+EPdKJWCJQHZDgBoFNPliCtQ== X-Received: by 2002:a05:6e02:1c8c:b0:348:dafe:61cd with SMTP id w12-20020a056e021c8c00b00348dafe61cdmr23304542ill.22.1691080051338; Thu, 03 Aug 2023 09:27:31 -0700 (PDT) Received: from localhost.localdomain (71-211-152-221.hlrn.qwest.net. [71.211.152.221]) by smtp.gmail.com with ESMTPSA id b8-20020a92c848000000b003489ccea184sm82116ilq.10.2023.08.03.09.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 09:27:30 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Remove f-string from DAP Date: Thu, 3 Aug 2023 10:27:23 -0600 Message-Id: <20230803162723.2119705-1-tromey@adacore.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- gdb/python/lib/gdb/dap/breakpoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/python/lib/gdb/dap/breakpoint.py b/gdb/python/lib/gdb/dap/breakpoint.py index 0aab4f3c089..76ff129ddbc 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(): -- 2.40.1