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