From patchwork Tue Mar 19 17:33:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87372 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3BA6A385828B for ; Tue, 19 Mar 2024 17:34:53 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id E1F2E3858CDB for ; Tue, 19 Mar 2024 17:33:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E1F2E3858CDB Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E1F2E3858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; cv=none; b=QDq7qxHkb7J/rFshcs937qg4nt+jr761E7kUmAzRI0+RB9pcrB/dXKECQAna4B5g81K9O856CIQaOgxbSmLFZsflObJg/Im4E7b0sDEb79QbaDmqVcol3zmLeZsu52pr4GttdS7TP/Jx59NWPVMfQrydtIsL4jDaKM5n0jC6468= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; c=relaxed/simple; bh=v4a7BYtHajJjwHuYZt7kuHV1UmRFmcHV/cq5ZfCRlCk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=vCDxC950GF7kl3Why+Ee8+iW1WVrW2F5DV6SzY50/HnDNjUxXf7GwF1pp3Pu8rwSzgpAzqBofLO1aJhUVqGqPefChbfFu948X9GLNPj3ORACvKn+4745rAUWJlh2Z7r19fhUZpHzKNB7xI4jtGWcp0WZez0oo/p3PxbEE6QVoSM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7c88c7a9262so110449239f.3 for ; Tue, 19 Mar 2024 10:33:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869611; x=1711474411; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lru8WCFvdnnxcitcQCcphQ5F1cGTWH77x3xX87uYbcE=; b=D6X7K5PxfhuPmXKo5QBj+eGSyg4JGYrHzTCpJK+55VL/j0aNgUETP6mdUB8xYopRyD ghWwpN1Lr049cHg1LNXjzo5Lo47PqhOaWjQD3nZ3RO629Vg/5rQAuh4egaqXmNoRZLdA enDWKU5zIkaB2RW9+t+KNCisYNeGU9OL7F2YZM7cY/98QjpXi+9SHtSJ7VwA70h1yPKW aY2WA6inHMWqO/bl7zmPvhUd+W9E5pOD9MnYvWaaKw76k7RmEq7E8qSFq1NEb3a0LFHA RV4F3gzGal2AA2dhfRfZ3Hq1wUwdOrh9LpyHKtW/kalwDmWHajMtW5r7oaPa0m2s/9Bi 3/2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869611; x=1711474411; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lru8WCFvdnnxcitcQCcphQ5F1cGTWH77x3xX87uYbcE=; b=GUwNFACUJG6z6vlnrD2Ke3gklMwEkD2hCAQHpZjRU2mlt2hlKKCGa7KTAzSYTt6z5f F6ck+6w6buui8ZpTYMsPbdCizDTHEEdsIjf+6eZ4SRdvZkxai0DT32XIkFnQJ46dz4gL USvDw92tcHR1UbrC3JEApNvpFlk9C7MhFDAGUxYgjuVZukDExCJnTPzzY7b5yY5+qSF6 EhERLdTbOcCZ82SZ6CCDON+BMsQJT/CyqtBxrmBIos0z3rHS8ifGavn2peVJ5WkKctmy rNC4kyKXWq20EjS9IZAM8tp6u6QldeM/HAJxe9vWYZEhzBK/TE+5Jzt7X98cK/vzb6h/ aEsg== X-Gm-Message-State: AOJu0Yxv8RtEu82E3TtGZ4bHGDXvseHqdTqcnlI+zjVx/FkcXTBPewMJ /0QhZLR4pCfRV4qfOpEQGmEp61fvX/dBCdIPtmgolrywPBkGTlhX5lgjfseNz7nsaCa1dM/GvjY = X-Google-Smtp-Source: AGHT+IEkzzIRTePFBBrOch4BguKNxOOSy2I7+cCcefA/YxVeV0T3lbmHOAmTF/KFKEgX7blyQHXTlQ== X-Received: by 2002:a5e:de03:0:b0:7cc:72a4:2771 with SMTP id e3-20020a5ede03000000b007cc72a42771mr3187494iok.16.1710869611127; Tue, 19 Mar 2024 10:33:31 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id z14-20020a6b650e000000b007cbf1b72c64sm2561310iob.26.2024.03.19.10.33.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:30 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:30 -0600 Subject: [PATCH 2/9] Fix flake8 errors in dap/server.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-2-893549dbed75@adacore.com> References: <20240319-more-flake8-v1-0-893549dbed75@adacore.com> In-Reply-To: <20240319-more-flake8-v1-0-893549dbed75@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org 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. --- gdb/python/lib/gdb/dap/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()