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: