From patchwork Tue Mar 19 17:33:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87373 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 E85B93858432 for ; Tue, 19 Mar 2024 17:34:54 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id 3ECB23858CD1 for ; Tue, 19 Mar 2024 17:33:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3ECB23858CD1 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 3ECB23858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; cv=none; b=UHJovvPlqOiVbOBiZaORxUiU4UOLHSNKhpsShhXj0SK+cSKkX6cQSrQsOHkzbgPLrSwCNWVX9LwbATtpyZquXebvK4/l6uV8oX1j0f/V/IUxgE2Qi+UcGmjc2X2jF7/Hh2A0XA49nayMS9jt16ZbOiGr6EtUP/xnE36s1jXbamQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; c=relaxed/simple; bh=7GX4XjZlulXvmK9gbSaPMGJImf5LTqS7KocOy7r29j8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=dGz2e0t3X62xJwxneE07mARlxBgEok39mOOQ09WRiyYw/ji3mlgagpxkO3vwqa67XurA4ImXrxOvEYteR73PCXzmAyHs0XcH9q4cTR2IgKBuo1/rMlrUx0WXeyzClhx5DYW5NXiYWe0uPxw1FV2BnxqAT/p4azkQ35JYRP9DDUk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7c7ee7fa1d8so175213439f.1 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=1710869610; x=1711474410; 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=gWTanY3IKUm4x/0o0oXOUDezFPm5CQDOm0evquYhfuI=; b=MwWfn3Wek4G8PE3892YAohuA9us1xjpk9GAHZA+Gk448kE1NW8leqJkhXevHYZca6S Gm08+h9OXWZSOz0pB+WmoXy2V++wu90caA+Obn0+igDLrahJCS3jpJlPU66Q4uHQXvpK 5JsMnHZVjLDJwRucuiEMfRP31KLxO88HB4OefIB9cMeIDNIaOHDA08v9/4ru/8eIUfgo hxpML5NrsRBlBfikxgyiRe8NQ9W8NI+VFq4bZAYaUx9XIp7Rd5MRAHM5ZFt9F2CSMfCb dvA0StY0yBaBWsY2qPhghDUWJptEDU5oZV6P08uGs7RbUPH4SndWGuCwB2nLaehQPYRp m1lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869610; x=1711474410; 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=gWTanY3IKUm4x/0o0oXOUDezFPm5CQDOm0evquYhfuI=; b=GWkWG/qqXikBawhLTJrDCKng5K2iq38DQyQNUAMYfxTQaw0ENyLpHgibbSnXOrxA65 2qjgx8ttUiZU6+hn1yC1XTuEMzvpBFYz5Ztn3Uk5b3KWGWMApYabNy5Qavb726gv5Rvf ztHbDhLl4p0hhOGJ8g4IkL7v6PFvoR2nQAExefc1rIDxysI68JySttI2KeSXmf377fly NQQqIITLQAA+UvXAmsYk949ABBosO5/PONGmm5HQkQbKqdnIDVdVmwshs2of5RvUz9gL KS5CA6G2HkAUaU7qae9AXbAh2fEkDLiyuh0cFBOE0XpIZNhAYdf+0HYl1lxrR4hHfq6E otOA== X-Gm-Message-State: AOJu0YzYSL1u8D6eAryAPen5Z79VyrEwJsQVcUYtvaHNtKndLzDKgC3c aBpJAFlbbotrvsrZZBqV5K749liNQQOMV4K1NrNqifPsVjx8kXZcCuS4JYHNrv44JIcqTstZD5Q = X-Google-Smtp-Source: AGHT+IEYgtPDXCAvVuRKlEy0wTCyQ3hVJbF22CjfheY0JHEmncSSAOQEEEiEczF3OkxONo/1ywRtLw== X-Received: by 2002:a6b:d906:0:b0:7cc:7a:37d1 with SMTP id r6-20020a6bd906000000b007cc007a37d1mr13176428ioc.4.1710869610425; Tue, 19 Mar 2024 10:33:30 -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:29 -0600 Subject: [PATCH 1/9] Remove .flake8 MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-1-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=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 I re-ran flake8 today and was puzzled to see W503 warnings. Eventually I found out that the setup.cfg config overrides .flake8. This patch merges the two and removes .flake8, to avoid future confusion. --- gdb/.flake8 | 2 -- gdb/setup.cfg | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gdb/.flake8 b/gdb/.flake8 deleted file mode 100644 index a6f727b8d5f..00000000000 --- a/gdb/.flake8 +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -ignore = E501, W503 diff --git a/gdb/setup.cfg b/gdb/setup.cfg index 13aefa0342d..2e83eb5cf56 100644 --- a/gdb/setup.cfg +++ b/gdb/setup.cfg @@ -5,4 +5,5 @@ # E203: Whitespace before ':' # E501: line too long # E701: Multiple statements on one line (colon) -ignore = E203,E501,E701 +# W503: line break before binary operator +ignore = E203,E501,E701,W503 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() From patchwork Tue Mar 19 17:33:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87370 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 6FA0338582AC for ; Tue, 19 Mar 2024 17:34:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id 4C21E3858C98 for ; Tue, 19 Mar 2024 17:33:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C21E3858C98 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 4C21E3858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869615; cv=none; b=HbEGjaKTCLcNZ6e/T0ubXKJm4bl15iiWaLAj+jVt6oF+kpvg2YUSVlWOb0m7xRsA298/mOHnQSFSo7fLj+/W/yly43YrQEYbOb/O6ifWVjctCs4ZxsGzWuXoQq7LZWQfyHaPc75wZXfX8lsmnXxDF1P22hT7Vf4Bj4FS35RxFtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869615; c=relaxed/simple; bh=5y9TOPoAGEC/32y2BOH7S6YiwSZ4eCSUYa5fy1ylu4A=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=PdnA22kANjW/wfDU+9Zzp2yqejuksYOnDMVrBI5cszK0FYSOqXkTH9SkwrcFVGHA/YM9m+5KBBWF4d0fMHlN2S+Fk1lr1BX+iu7KIC8KHjDKNAuevVLENAeou8M92SZpYmHmi2Sicnb5yEMIFy4u2iPBR0PNMr0PUsquLcsvhUk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7cd06b9682aso58444239f.3 for ; Tue, 19 Mar 2024 10:33:32 -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=nsUu3LSMWgEZWdPvQKGsjgfIPee3RpKUEH6YNRcbm0U=; b=KYLIOqhgXPBXzVczUkAJGz6auXzkYyrhIV74H5K41qw0ltes1FF5wkbD8C6I7QG2Ad +Msb4t4AliOn8ABvIiMm31RkGS6JH/wDs/mhWna2CtzSBKQIiIvO8tm497t1iTBjTpHd 0PnsLA9HVIo1esuOba6u+jJaV7M9NwGTMZjTh/hsPoBAeR4ZosoqCHMFWpd0agfldHcu +LqvBtYLtB/63IB2WhTHDTYMYZZRsW57PW0z5V0Q0eZ+d99YbLoMkiRS1qvCJ+vWjGhc F2+qa0P2wPnxPRvjmrdjpe7HsdrpX0tnajWw94Yg7nJnzMtHxXojBudPW3iSqcZZQAa3 +hvQ== 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=nsUu3LSMWgEZWdPvQKGsjgfIPee3RpKUEH6YNRcbm0U=; b=WVt3bBymp30/2WK9YnYkvDFD3X2fMOQz1nD6iqOZuQUbQFuZOpSSU6FQksz/q3yRr+ +dvZCJXjb4NtO87k/Bn7Nry1waX7lopT0utYTfcm6RjIo206S9gm3QeovHwPlKxPrgLI FXlusL2nJ5wqSUNs+IHCpeJlkHShJp3t2F8YpW+V9SNhTJp0beA7BA/WqfYtVBdDvx7P OerVZrjvOsoTw51hHP2hbHq414MSedRwUO/ZzJX+9nLRpXoDjWfCpErOMA1YRRuyJ25G 20Zp3t0dj0fjisIXS/yQUq7yvuGopz5uOWpWCV7l+SddCzx+LGDA+jOCKhctiINwJAYy W2xw== X-Gm-Message-State: AOJu0YzIhclRiibH4CGsFB+EU0T4XQxigHdp34S1vu+nd/UYk5DuEPKX flS11aaRi5Q5VSevXi4QqG+1Ls5tl5oH9RifBzCNjNEYZmvKXCBUx4YGXBLEeMSuq4uXeUNEkfo = X-Google-Smtp-Source: AGHT+IHM2ybegrJIQUJngKcaVdKu9PJ3ZMWHgLv9kj51cT02RTHpUaGP1b3sRovECGlxJUPqRp8JDA== X-Received: by 2002:a5d:9158:0:b0:7cf:c28:568b with SMTP id y24-20020a5d9158000000b007cf0c28568bmr1654595ioq.7.1710869611507; 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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:31 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:31 -0600 Subject: [PATCH 3/9] Ignore unsed import in dap/__init__.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-3-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.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 flake8 warns about dap/__init__.py because it has a number of unused imports. Most of these are intentional: the import is done to ensure that the a DAP request is registered with the server object. This patch applies a "noqa" comment to these imports, and also removes one import that is truly unnecessary. --- gdb/python/lib/gdb/dap/__init__.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py index 86da9b8ef3c..f947314880c 100644 --- a/gdb/python/lib/gdb/dap/__init__.py +++ b/gdb/python/lib/gdb/dap/__init__.py @@ -14,25 +14,27 @@ # along with this program. If not, see . import os -import gdb # This must come before other DAP imports. from . import startup -# Load modules that define commands. -from . import breakpoint -from . import bt -from . import disassemble -from . import evaluate -from . import launch -from . import locations -from . import memory -from . import modules -from . import next -from . import pause -from . import scopes -from . import sources -from . import threads +# Load modules that define commands. These imports intentionally +# ignore the unused import warning, as these modules are being loaded +# for their side effects -- namely, registering DAP commands with the +# server object. "F401" is the flake8 "imported but unused" code. +from . import breakpoint # noqa: F401 +from . import bt # noqa: F401 +from . import disassemble # noqa: F401 +from . import evaluate # noqa: F401 +from . import launch # noqa: F401 +from . import locations # noqa: F401 +from . import memory # noqa: F401 +from . import modules # noqa: F401 +from . import next # noqa: F401 +from . import pause # noqa: F401 +from . import scopes # noqa: F401 +from . import sources # noqa: F401 +from . import threads # noqa: F401 from .server import Server From patchwork Tue Mar 19 17:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87371 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 08F7C38582B8 for ; Tue, 19 Mar 2024 17:34:24 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id A24D03858C78 for ; Tue, 19 Mar 2024 17:33:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A24D03858C78 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 A24D03858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869621; cv=none; b=BH+7aXUBxQ/0trIFqpfTnC/I0Z6lM7zH8Bv/rae/iwGeqpPLK45qmEpOQ/ayTna3HXdJivd+JhuvUSsQpbUzLjZvFkTi4rOGhZ7MDxxvo8hx8xl5YY6n4gn8fHtqyWWbSUqAAN7ohScSsZK6XVS6NshLYEC+f2F5utViO7gSWUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869621; c=relaxed/simple; bh=5KlYrs2VrETmLdf6esiNrEkupQ6qRM9x7PBmHa2iEsQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=XNZvgqb8J1o/T23UKGhXTmGAk2lVetzRs5yMr/yI98FIjKT+rJmvnFclFm8d1gyTDmxoTbV6yXZpU7fFCmEMa40EVwUPz8r9C8qlLMIvIEZ+qAFgu3iuapi4OcjJAHzczl6m6DF2+RozvYh216FYsSA509mAoGEdDCTwb2cUt4M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7c8ccffacbcso92753239f.2 for ; Tue, 19 Mar 2024 10:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869612; x=1711474412; 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=T+AzeV1AsxBfR41op/UJ6EcuaRLpVzl4RzeW9hdppXM=; b=ZbZuOkDfaESXX68FVIAeWj2hyFib951TXUDpWXONB0K52jTocAU4J0ll8N/pgu7HTB cN9Dq424QDNa1REmnpHFT0UmzrdxaNIr/mggn1sbN8Gh9IZzSfEkvQ6deAEoOJU4B8s5 9FrX7ZC5uz512n2ZIJcp1KnsMIfSIYN3dvHWAxYEj+aXPGWV+y/sEo8S2Zp8gUGHwYvy WXRW0oC45ArKFj5/BvKCRkUeHFPh86WQdpYmFvYUKWwnhfIY5znxKkq3huywgVDbyf3M 7U3V5+NGLz4uXuAe2O8PqIj8N/bjMnpv9wEI4ip0TJWzoPjj8PrKg2YLgci2KdFOF1X7 Mj/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869612; x=1711474412; 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=T+AzeV1AsxBfR41op/UJ6EcuaRLpVzl4RzeW9hdppXM=; b=rqxKtSFa1rK2Tik0eRkPjCH24wxSdcX7dYFsg9+5LoKKYuRZC1KT2vWnEe00zoblzF gz4Sj/qdamTqeSp6Otd6PbFspFrb+ueEWrZuRMJ1kdafbdHILEefsrvocm1qCYoxW6y7 Ve1Os2MaM7jYdYGiCD7ZeNc38Mg2JfZ0cYtg4VYibVC7PA+hfPTmvmBBGdGKP8KRjv96 ih49QqGZUu1FR7JKuU5aoE+WhBKD08TNI966t917M+I8SKMITxAizIxLT6KqpDSczxKM /zHkvEYLb53VAJRYW1qQEMIWBCsrfqnhSS/ebodoXBXMmeV9JVQwUdElaTT3P/XimNMD CeTQ== X-Gm-Message-State: AOJu0Yxi4xGSMs5tiAlGDmaW+sFWLNgiPQB+51l+Dse3LlOYzbFVRYI5 yzmFC7vK3Az+v61ftXRGnpZkdWzqtZ2eN/zlhnlGI43i2Sgm57b3k/jqvNSkRaNRPOozmDpBFNY = X-Google-Smtp-Source: AGHT+IE3YLEQIMc1ku2PjnWw2KXoOmaSleDrR4/My54MynlQ7Qc0Uc5S6RmqZ/QArO3yLRjotTPEUQ== X-Received: by 2002:a6b:e411:0:b0:7cc:672:b05a with SMTP id u17-20020a6be411000000b007cc0672b05amr11258460iog.13.1710869611857; 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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:31 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:32 -0600 Subject: [PATCH 4/9] Remove unused import from gdb/__init__.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-4-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.0 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 flake8 points out that the import of _gdb in gdb/__init__.py is unused. Remove it. --- gdb/python/lib/gdb/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index cb3732e55f5..9f0f6dc1e5d 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -18,7 +18,6 @@ import threading import traceback import os import sys -import _gdb from contextlib import contextmanager # Python 3 moved "reload" From patchwork Tue Mar 19 17:33:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87374 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 651BD38582A2 for ; Tue, 19 Mar 2024 17:35:12 +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 ED1713858C31 for ; Tue, 19 Mar 2024 17:33:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED1713858C31 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 ED1713858C31 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=F6hRICgIVYSBBQh+C3A2Sem2UvaRSPr3lTMZrjHZsT9SQHfCS1isdljVjQ6rPwf00Eq8O8hwaDF8Gs40NcPqn/aobLRxcyMHvVTJ0gK4nnCdxVSu3skYHSNsN6qRNRpaAGmdMglKuK6gjHgb5LRkQXw7GkTN5bdrr/TWf1PLGIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; c=relaxed/simple; bh=bEdPFONeWWaugJs6+iM+VEr5Arh7U59x32BmfMj7dx0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=pJeKFV9O8dxXVTUbhgpnP0eexGTcOy/59TiZ6ZQzxUaFwd7kOPo1m+khB/b1l/GOTsR5A20QBwRfpByPtdNatu/8Z/rqhChMCA8DXDyX2V3xiJ29futMNJWVJ9fUjHoBJ8+OaUxoxB2DNuBeL86Lo0oMwdrPxOj18XBVuyJRlhY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7c8ae457b27so124817339f.2 for ; Tue, 19 Mar 2024 10:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869612; x=1711474412; 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=sESN5vi0JqrHRPQBC/eTfZUQWqr+YlMbIgn+Vd5Ulm0=; b=C9haNt+rCyhaqQO0anHkvoxuQhHjqGe9dOIq8+Za4jld2YuJobksTGKFHt2p7HkKuu SQFwDsdFd0mF+PgwNtMSM20rnOfOt6CcuQ6LAKVZxK2sfQXYGY1lHlr3EhRLI2u94AyY Fqptyb5jC6qQQj/SmY+/qdEAsrIjrP0CgNrC9S5On+Njf75U74zt7UBKhky8Y+Gx9tfo NLo+/ofZjw2RZ5u2zQpYOMaIfetSNqssVdi/pA3bWB/yHfuDJEecHhmE5ckTHhiuKGGp Jq7MSAf/3cs58te7oNT6ocmggzWlMLVWjGafcuSk1uo7Piw5iJB65jFGPR81CtmQhVuh 2PBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869612; x=1711474412; 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=sESN5vi0JqrHRPQBC/eTfZUQWqr+YlMbIgn+Vd5Ulm0=; b=cO8O0+WEi/vyZtBxx5a4z/zhZgPvGFdtAaz43IjivtTYfq5cn8zu9YzWombXEXeOXq ntk2vb/2XG88oK23qn/+YwRtFfvsZr+Oh5nKPwUy9wJumaig6qmwKGWGAyboVHN1EfB/ 9TQBzYEkB6bHD+ZAtsgWCm3pG7qCYuUbcr9nIgU2511p9EML0fELwpdIt38vhc1VQ488 p8JkfdNsLNXaZXzFtX8gzcpXFtMkJ81bU/h9e0uSR0prP6aNSzfFd6u2x2KKcDcXJzg9 04/4ngalXDW/QycAA2Y4cDLTbKYfIFIDiJ3IMdr5wjrRHbX6TL2bwlN4SS+p0CPm7idi mzuA== X-Gm-Message-State: AOJu0YzLyEaWZXEx5Ocx4CJS0S5fqwQNawtlOdH8FgY+V4tQGfVwEwgV I7uvZ5ouVI+qKbhb1wAn56u43WFyiXcqoSlqUc+goMXmgfzv8gpP2pxQdTYKWiQk2G25RtLu4bY = X-Google-Smtp-Source: AGHT+IFomdYk1mMTFlNW5QKJ2mzL+BxgRH4mtkW3Hchi8UG9ATCRIis5Fg8f44vUnevIrNclvTYLqA== X-Received: by 2002:a5e:9241:0:b0:7cf:727:6b00 with SMTP id z1-20020a5e9241000000b007cf07276b00mr1823084iop.8.1710869612213; Tue, 19 Mar 2024 10:33:32 -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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:32 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:33 -0600 Subject: [PATCH 5/9] Remove bare "except" from disassembler.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-5-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 flake8 complains about a bare "except" in disassembler.py. In this case, the code purports to guard against some kind of user error involving data structure corruption. I think it's better here to just let the error occur -- py-disasm.c will show a stack trace in this case. --- gdb/python/lib/gdb/disassembler.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gdb/python/lib/gdb/disassembler.py b/gdb/python/lib/gdb/disassembler.py index ecf42688ae9..2d313ae2122 100644 --- a/gdb/python/lib/gdb/disassembler.py +++ b/gdb/python/lib/gdb/disassembler.py @@ -93,21 +93,14 @@ def _print_insn(info): disassembled.""" def lookup_disassembler(arch): - try: - name = arch.name() - if name is None: - return None - if name in _disassemblers_dict: - return _disassemblers_dict[name] - if None in _disassemblers_dict: - return _disassemblers_dict[None] - return None - except: - # It's pretty unlikely this exception case will ever - # trigger, one situation would be if the user somehow - # corrupted the _disassemblers_dict variable such that it - # was no longer a dictionary. + name = arch.name() + if name is None: return None + if name in _disassemblers_dict: + return _disassemblers_dict[name] + if None in _disassemblers_dict: + return _disassemblers_dict[None] + return None disassembler = lookup_disassembler(info.architecture) if disassembler is None: From patchwork Tue Mar 19 17:33:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87375 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 CFCF6385841E for ; Tue, 19 Mar 2024 17:35:27 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id 79FEB3858402 for ; Tue, 19 Mar 2024 17:33:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 79FEB3858402 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 79FEB3858402 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d29 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; cv=none; b=Z++DQda17qpx6OwvIVz8lZ5PTsFT+5qf2VZCBbTbCAWJX+Bag0kXf4FOwg3loiOY4xIfsmbcg5jCTOw1arqYMNw2mLOOtpxlAY3PS0WC6wSbJe/zkDnRlqoavL0VXaqas9hfL265r/Z3JU+qIDGX20blnsDGsyOG5KTjhZn6MCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; c=relaxed/simple; bh=dizY3w6LZ0zYQxzndOtMPIhcfVLEOVS3fqUxtMs6rUI=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=LJT4rXVUii9EtIZ45hvXhyfj6mfMWrIcSerV8Z4twMjoSdKTm3xZZLFsMiFJl3XV9CLe4zvt+/dX1e7CIqB+KVp9omz5fE/zNTOTwKHcdYkRfTDtYcjkLkWnjreZBGzpdd51Z2sIVGbPStILNpcsO9W0dQyglnXJ7HY0+IkZNxQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7c7f3f66d17so137678839f.0 for ; Tue, 19 Mar 2024 10:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869612; x=1711474412; 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=WjpP6KMLd+9hmkTXbL15Pbnc0WBU2awpkZajeFnjeDU=; b=cwmo2/9Dz20TejUn2AJFQw/20yPA6fJDiTIA0ubJw190ABrWXzn5QdFhUGaVxgS9bR Yt2XRVwX7C+B4oprAbhn/xdwJ8gs1lmuhuvHj396vPqWxfg3yuQ49lZGavfAU6rar8OT TMTei6CV2q8Xok+Y2vwyuoeVSytG4jJNnS0mWjjHOuT4i5DcG8ZtmmNrmMeGStMr6lTF 7ZiHawdJcrNXwb4sPiQkTA8Yd8Y+VP8W0jDVWtZRwB14ZgLHIXmKOiMEDb7IPXqCvtuC u5wVVaI8kFl9r5pDX0ldbunHK41GMbk/H9VJSlOFJGIILRu8s7Njio30mDS5QpNyRNyh u1+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869612; x=1711474412; 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=WjpP6KMLd+9hmkTXbL15Pbnc0WBU2awpkZajeFnjeDU=; b=qewcPCaiJSHKYs8vB5bHD/tX162Gouhcr4UEYzAU+ILlgK9lPCJxeURwkA2EV8/RYf KGDaCDj9AZm+wP1OJQyyrS4RpA7WH14twIS8JV70rFLVP6GjImb5oadDF16D10YMcvW5 YXt00AECIx3rYSsBc6uPWanUAD5bZpD22bqAtvbDFnLPHruUo2NALwlQLE/C/CF3Rb5O dy+4Ou8p3eDnDxAZ2K6cdyZO1up/C/+bbGbnGmN7rZ4jTHQ5PzfSLU99glLo+KKtJsAq xVBXqssSytHJp21b5VCpF3QVGGNn6K6d4oTqFk+aJYtP4Z+g24iDlkdG1U+Odc4MBxS7 Y/UQ== X-Gm-Message-State: AOJu0YwDQHsz8Dx6w0YrIBpPbzG0q09SKVXDnx6EbL40Zq1kLL6OF8X9 wQCl3U0q7btGrJCRTVTiV/T/tle+89ooZZeAwwYsErL+wsP6YrdGJIncEigKEJpJreNiVRK6hso = X-Google-Smtp-Source: AGHT+IHJRTkii81C8nrx/6wysYSp7PxA+77AJiBb0chL5X7x+0ORnYqi7R7D3iBXJ+5sH5PtV0pfcQ== X-Received: by 2002:a05:6602:120c:b0:7ce:cddc:d9b0 with SMTP id y12-20020a056602120c00b007cecddcd9b0mr3513206iot.15.1710869612674; Tue, 19 Mar 2024 10:33:32 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:32 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:34 -0600 Subject: [PATCH 6/9] Suppress star import errors MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-6-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 flake8 warns about the "from _gdb.disassembler import *" line in disassembler.py, and a similar line from __init__.py. These line are needed to re-export names from the corresponding C++ module, so this patch applies the appropriate "noqa" flags. --- gdb/python/lib/gdb/__init__.py | 3 ++- gdb/python/lib/gdb/disassembler.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index 9f0f6dc1e5d..2ff1f95c8fd 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -26,7 +26,8 @@ if sys.version_info >= (3, 4): else: from imp import reload -from _gdb import * +# Note that two indicators are needed here to silence flake8. +from _gdb import * # noqa: F401,F403 # Historically, gdb.events was always available, so ensure it's # still available without an explicit import. diff --git a/gdb/python/lib/gdb/disassembler.py b/gdb/python/lib/gdb/disassembler.py index 2d313ae2122..af7dcc5f6a8 100644 --- a/gdb/python/lib/gdb/disassembler.py +++ b/gdb/python/lib/gdb/disassembler.py @@ -19,8 +19,9 @@ import gdb import _gdb.disassembler # Re-export everything from the _gdb.disassembler module, which is -# defined within GDB's C++ code. -from _gdb.disassembler import * +# defined within GDB's C++ code. Note that two indicators are needed +# here to silence flake8. +from _gdb.disassembler import * # noqa: F401,F403 # Module global dictionary of gdb.disassembler.Disassembler objects. # The keys of this dictionary are bfd architecture names, or the From patchwork Tue Mar 19 17:33:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87376 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 02F963858C31 for ; Tue, 19 Mar 2024 17:35:51 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by sourceware.org (Postfix) with ESMTPS id E8A17385840E for ; Tue, 19 Mar 2024 17:33:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8A17385840E 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 E8A17385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869624; cv=none; b=CTqoo2mgNVP18yEtA3QHL3bE9PHgLcC5h8oWzEWaGPPqLth/63/oRYoIBPsCcj24Lkc9MnTt4HAukjQPmWmhVQ2sPMPot9M0mypqu/ljUtoCojIyuT3bP78yNVB8hjrj79pLqQp9nkx8fk2CPiy21Z8Uq8qsJDdUbU+SZGltSE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869624; c=relaxed/simple; bh=vb90TK2M7aIGTy5+xDwu2TnEWJRYZL6Y5fM27JCzgYw=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=wUbsw4vDTOM18IxWOFxozl96OvUr+gZPfG1vJgYAAYdN/Iv9DkoXIz7uWidZoekrlOTPMarScri5oMjDlxvlvNeQ4l8oA3PACdT8Ew7vscKRUmMkkjdQKl0mTY/UvWBfQ0PLQ/tEbQUz7cJgo+8+RnATo+K9mSYrV70kq7AX+GA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-7bed9fb159fso210010439f.1 for ; Tue, 19 Mar 2024 10:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869613; x=1711474413; 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=HMAyVWcasIkQJiqdZi8jndnmA9HfKh0rGmOVDNIbu+E=; b=fQ/soFva4h56MnU1G+Fm4SmL/LakbvImPFXZ8iQTP5vThF0DIHpGfjTXAJ8WNUDK06 ZVHIZiA4bJIEVtRJvcAU2dKH+GDkDtHL3/oeBgBzBNCxwJmTE/iyJdDS2rn93Hd8oyi2 JmcGOnA8yCB9LVnKvE7tiT2ErOWZnywGs/o4UYoYD+2CyiLqjU9/pb5nvoyj5r0VhHuB Ddmr+dRwo6iLeiIfQ+NzYQYei75jHaaLYmHlbdwbvN4FNg9fUBpZum53btZRh/kJuHGZ HXZATcd+nX8Gkmv0HkrVhU+iNf6vkfRCHAZqG8D5XqVi63i1FVE/Jyp4j2/zcbBwRgAP uSGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869613; x=1711474413; 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=HMAyVWcasIkQJiqdZi8jndnmA9HfKh0rGmOVDNIbu+E=; b=wPKWzif8oWHtUc+/bS7QgnhJAhbKJT0CFq4aTQed85VX35ZPRBDISBum63/9XFe5HF GSPQ2x+spZihyG0rcTpw7DxTJN4+EeXLZfXNjJITLhjCqnCEq7yUDkFzw60FR0xTaSEF +HArUh61FKunKe8f6t1RNxnsPLz+4hveWlMJJiE6sahfKTTQnNpSzWPutrIfw5QWhSQ2 ah63YyZdwEN4ipWTE4izlwEteUNE1B4YwkyT6bXcH0ZiU625VruLmAf2Z811KXBPQv2n ztBtaLH7hP/t8pyafdHumqHrgppMXkojfzYASOzAf8SnwljPofnSDpnKXCNDnbuEi39G P3zQ== X-Gm-Message-State: AOJu0YyNoF/TAJuB959akYBXgbs3NKSM32Lx3MRMWL3JzfAXhRHqqJyS BGLNHD37sdUid05RF3Nattgv7LLTyDPf/qVoDI3Q7AuQ33Zoo9zrSIYnBmHBATMgxL5xzYMbzxU = X-Google-Smtp-Source: AGHT+IG/PQvc/NOzJU1Jh8VYX5CqAQH7RtWjBFjnYAqxFKxi6OXpATGN+oCAqcSnARdcW+snmxu6EA== X-Received: by 2002:a05:6602:29a6:b0:7cc:1cb:2bfa with SMTP id u6-20020a05660229a600b007cc01cb2bfamr3876887ios.11.1710869613138; Tue, 19 Mar 2024 10:33:33 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:32 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:35 -0600 Subject: [PATCH 7/9] Specify ImportError in styling.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-7-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 styling.py has a long try/except surrounding most of the body. flake8 warns about the final bare "except". However, this except is really only there to catch the situation where the host doesn't have Pygments installed. This patch changes this to only catch ImportError. --- gdb/python/lib/gdb/styling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/python/lib/gdb/styling.py b/gdb/python/lib/gdb/styling.py index 9608b5e2048..704c9926c29 100644 --- a/gdb/python/lib/gdb/styling.py +++ b/gdb/python/lib/gdb/styling.py @@ -92,7 +92,7 @@ try: except: return content -except: +except ImportError: def colorize(filename, contents): return None From patchwork Tue Mar 19 17:33:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87377 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 1E1B93858C78 for ; Tue, 19 Mar 2024 17:35:55 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id 404773858412 for ; Tue, 19 Mar 2024 17:33:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 404773858412 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 404773858412 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; cv=none; b=NfSuDnPDTmCrZy+k083tD7WDQ2Ez+Q1zju+DDx3872ujZtnW7Ptq04YKXnUo8BvWlRytFnqb/IaWiQlnsddjp3QdMzh+Ff+llkVYJ3vGNpN6TCsPXunnaKSPddS84Mn0rKtaWZRmnglby5gghehC8KDmmKYrGQDF9eOYAPTHYG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; c=relaxed/simple; bh=aKqesEIHqLWMHPfDgpJgYkWJvGaJhdXQ0wpv49WUrZs=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=ESLhlvvx/VBI8VINr4Wsle1GzI6SGQQyNH9YJqEtdZdfK6DD1eHxMoKwPGnFd/Iai4CaVAuZoHBRxO8MziGMimcvzNRex/kQ8EVz6vcA3TduCzQC6asWTRmGZ4TAqipLHEhw879Nb145uOGLSdTFc0uXtFJJHHG8MWDNLT+b01o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7c8dd755793so115107639f.0 for ; Tue, 19 Mar 2024 10:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869613; x=1711474413; 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=UK1XsHRZTbIYmsRwedt0O4ZRyxZ+jvFm3jKDgO6dWG8=; b=VVRuGVyyd6gzRrQbjYUAjDetFU3XG5LnFHKNqOP21xC287EzzmyHGpqR6od4dtgrQD 85cv/PaUglvBSW69d3a9+KEzyb4+fHgErABCIndOwS3rkUZVPL5RCeIegRzAw/oZ+H9t AUR9fiDuw1jvWSdO58pyH6i1I6AF9NZ8hGzfu95Q4CRIVqy6Bdvx3GshL9T7OdjEOvgG t+mbcelTokrJiUv/vyb94vih6Uo0xOzXEsagZbrIWeczILC44cy9Hf+Ii5RSgQEfoKl0 Hjg+mvSD28CAS8cLFOFK7H//DpdXgQu6zf/L0zyo85YCAg3aeSj2E4vwJ9qj4BS5tI+Y bVLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869613; x=1711474413; 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=UK1XsHRZTbIYmsRwedt0O4ZRyxZ+jvFm3jKDgO6dWG8=; b=Qe6uTlVF2iAFUj/g/CnnID1S16y935p9aYqThAewFQmHLIWlsQ0hSKzQpkzwmpmJV4 JLlAzagckTYjgP2VwS9vYmxF9gA3dFSOK+WkqHAtH3hopiSIDNV4qQ9sOvuy+s2vNtVz ULvZKZ8zjW8CmyBtaUyXIFqyNerRZshOGAe8RJ86xYdU3HcrBuBajZe6+arePUoDVWdk gjqG5W267g4YFnApKVH95bIv02Vc2C2/lGMHT/cp7k+AFz2BfiAqVZWgy83VqrVKy7fJ 6Cj/AmSd5LIeiqnhl3hrcA7QOVVNdNuVbH/Vt4nV+z7PdbEJjTks7f4BuQ7TKHRNm09l t7iQ== X-Gm-Message-State: AOJu0YxuPpwE3xfqdURSmypttl0+GAuBev8qCrHWhIVe+PaGkgVlsqOu hWnltUneIP7fZahjzpRnto6ETBX7TbSnectiu/dLx6g5IAfx9rZppNei76a1hiDavspCFftdb38 = X-Google-Smtp-Source: AGHT+IHYkM2hG8Dm7rJ6gSY2IjhsLhXvrVvpYnQG4c2Tf+RSyClC3+rSLxaZez4MJfmdX6HZE/bNAg== X-Received: by 2002:a05:6602:5ce:b0:7c8:b447:c3e9 with SMTP id w14-20020a05660205ce00b007c8b447c3e9mr17596934iox.7.1710869613497; Tue, 19 Mar 2024 10:33:33 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:33 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:36 -0600 Subject: [PATCH 8/9] Suppress some "undefined" warnings from flake8 MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-8-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=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 flake8 warns about some identifiers in __init__.py, because it does not realize these come from the star-imported _gdb module. This patch suppresses these warnings. --- gdb/python/lib/gdb/__init__.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index 2ff1f95c8fd..cff2f3afa49 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -56,15 +56,14 @@ class _GdbFile(object): self.write(line) def flush(self): - flush(stream=self.stream) + flush(stream=self.stream) # noqa: F405 def write(self, s): - write(s, stream=self.stream) + write(s, stream=self.stream) # noqa: F405 -sys.stdout = _GdbFile(STDOUT) - -sys.stderr = _GdbFile(STDERR) +sys.stdout = _GdbFile(STDOUT) # noqa: F405 +sys.stderr = _GdbFile(STDERR) # noqa: F405 # Default prompt hook does nothing. prompt_hook = None @@ -185,7 +184,7 @@ def GdbSetPythonDirectory(dir): def current_progspace(): "Return the current Progspace." - return selected_inferior().progspace + return selected_inferior().progspace # noqa: F405 def objfiles(): @@ -222,14 +221,14 @@ def set_parameter(name, value): value = "on" else: value = "off" - execute("set " + name + " " + str(value), to_string=True) + execute("set " + name + " " + str(value), to_string=True) # noqa: F405 @contextmanager def with_parameter(name, value): """Temporarily set the GDB parameter NAME to VALUE. Note that this is a context manager.""" - old_value = parameter(name) + old_value = parameter(name) # noqa: F405 set_parameter(name, value) try: # Nothing that useful to return. From patchwork Tue Mar 19 17:33:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87378 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 A00BA385840E for ; Tue, 19 Mar 2024 17:36:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id BD7BB3858414 for ; Tue, 19 Mar 2024 17:33:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD7BB3858414 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 BD7BB3858414 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; cv=none; b=KD49OEQjAEj40Aso17gGDlwxFwwavSnSjbJHnw3exHzhgmpX/hSlJbRZ4DC1h0BOp9iiLmhKFtuJkEFUoz+khjquV3tcGBOsvUlcBJhYL2Z/scP+/SOzm8TY7ZzX2tTrPCjxvMyJ9ICBlYDOU4vYUSmaxueiDvSMVMEX4HwTckc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869633; c=relaxed/simple; bh=Nw+z7ZOnWlPIJRLchjsytWko048nikt0UQ1bB2k5WF4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=b5Amam5akOVo1shiAdTiOhuxBbmho2aeEfhDMfpSXDAz3X6Zwa53DLo1h440N2iJcCBz0xbWSex1/6HhG37mpdQy3IRjQe+Dg4+k7I25v72LXPqe65d4MchaS2WqXvIMijF/EXrl5hHSjnHjfC0zwmW47/e6KFw3aKTcHE1xCHQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7cc01644f51so156828239f.2 for ; Tue, 19 Mar 2024 10:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869614; x=1711474414; 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=kJXTeW8gFMGf2ZJlf8vltUF2vERqPOg1528h5AmKAVM=; b=B+pV5Wq77A3srMEM8AWtSUNtk1MYf8h2jnWT3GldwayV5y6T2AA+6+ukqCm75oH+tI ABChC22fVmDK2PlmrBJRZqlA5j/IrCs7Cr1iGgyW1KhLNz9whUX8EjxZayFcDxU6M2Y6 CAbMX5gLaV6azhau0g91QJX6WboYeu/TVpZ0oamQmpK3aPQQUuKL2nZirypfCnzhrE8u h7RDa5szB67OkxTJjDyK+UMgfq0qctpfQzK+zIQKw6iBOxlN4bX0cl//FBeiSVoOEChr qapnFy3VreNu4kkhEp38kNuXNUCagF3eUpnthAQE31HxsGQZKpWAAZjA9zdXOwE9lKs/ DqoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869614; x=1711474414; 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=kJXTeW8gFMGf2ZJlf8vltUF2vERqPOg1528h5AmKAVM=; b=B1Jy/6yUXtLmI15oA/rNhkOUKAOORjmuObZrnseFRq8YQXztkMUeYpxDpF3ZKu8Alf UFHvLtUrWP4DP8I9arsLKzPAQtCG3J2Y56fb5lAMFq5p1+MI2AVPDZEREgA3KE/4brlP jp1TsP9OrnB63RIBWMEw52S55+l3ZCiGIFTH4viayxK3kkr+/5ghKid5xhWc0rq/0jYv 0AtD2Wpe/rmh6bpBuVebARQ7tx37IbK0y2GwYSyYSiCXgv4aUWAPCL2UjTdqTWT7JQ49 E3DA+D5npbxHCaRdA5VtFhCHenng2RZtjTxxvK42ZIBZmnebZk/DAAhzQ4oZaZMLGT6S vxEg== X-Gm-Message-State: AOJu0Yy3gLKoUTYCXw2L5gkAn6dTHD2Gxr3ULUvtDzjv6U3O638TMddg ZGPGaisUg6Lnm8/9CAV6FhJEGzRDtpQDCmw3jlBAmBpLYWkUkjUSD35LN/Gl7mL7YxqeTc5jrK0 = X-Google-Smtp-Source: AGHT+IFDF9UIpK+QA7ajdSctmWe4QPdHyHmnpYpQ3Ng+vyINVhVEox3Ij500tiOl8erR4C5KLpRAIQ== X-Received: by 2002:a05:6602:4446:b0:7cf:15be:6834 with SMTP id cv6-20020a056602444600b007cf15be6834mr823829iob.4.1710869613871; Tue, 19 Mar 2024 10:33:33 -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.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:33 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:37 -0600 Subject: [PATCH 9/9] Do not use bare "except" MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-9-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 flake8 warns about a bare "except". The docs point out that this will also catch KeyboardInterrupt and SystemExit exceptions, which is normally undesirable. Using "except Exception" catches everything reasonable, so this patch makes this change. --- gdb/python/lib/gdb/__init__.py | 2 +- gdb/python/lib/gdb/styling.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py index cff2f3afa49..e7d21fe8d27 100644 --- a/gdb/python/lib/gdb/__init__.py +++ b/gdb/python/lib/gdb/__init__.py @@ -157,7 +157,7 @@ def _auto_load_packages(): reload(__import__(modname)) else: __import__(modname) - except: + except Exception: sys.stderr.write(traceback.format_exc() + "\n") diff --git a/gdb/python/lib/gdb/styling.py b/gdb/python/lib/gdb/styling.py index 704c9926c29..8e5d64f15d9 100644 --- a/gdb/python/lib/gdb/styling.py +++ b/gdb/python/lib/gdb/styling.py @@ -39,7 +39,7 @@ try: return highlight(contents, lexer, formatter).encode( gdb.host_charset(), "backslashreplace" ) - except: + except Exception: return None class HandleNasmComments(TokenMergeFilter): @@ -70,7 +70,7 @@ try: flavor = gdb.parameter("disassembly-flavor") if flavor == "intel" and gdbarch.name()[:4] == "i386": lexer_type = "nasm" - except: + except Exception: # If GDB is built without i386 support then attempting to fetch # the 'disassembly-flavor' parameter will throw an error, which we # ignore. @@ -89,7 +89,7 @@ try: lexer = __get_asm_lexer(gdbarch) formatter = get_formatter() return highlight(content, lexer, formatter).rstrip().encode() - except: + except Exception: return content except ImportError: