From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 961703858412; Tue, 2 Apr 2024 17:09:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 961703858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712077779; bh=ZXul1PvhuWc0f+WTHEEcR7epjbSwy8PP+yphop6BWCA=; h=From:To:Subject:Date:From; b=ONf+nKeWLZ9lX+jv+iSLh9CLZSaTCjS/hfrX8ObrQqzQMODxY+xhb4qCcngdzhVqO Z6JFNMpi/RTOFdKUEsCcUhZ2kTQK30OorMhur8P8KisAJoKlnoxHm7uUnaVo3F7SqA YDKTsxN6v5R9EKuIUJoycNmPg/rag0FhRZ4g1qcA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove bare "except" from disassembler.py X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 5ac754cf46210dd8e0ea69689c72ab91d92eb69d X-Git-Newrev: 80c69af864ce523221ec9f439997849c91c7ba85 Message-Id: <20240402170939.961703858412@sourceware.org> Date: Tue, 2 Apr 2024 17:09:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D80c69af864ce= 523221ec9f439997849c91c7ba85 commit 80c69af864ce523221ec9f439997849c91c7ba85 Author: Tom Tromey Date: Tue Mar 19 10:49:20 2024 -0600 Remove bare "except" from disassembler.py =20 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. =20 Approved-By: Simon Marchi Diff: --- 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/disass= embler.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.""" =20 def lookup_disassembler(arch): - try: - name =3D 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 =3D 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 =20 disassembler =3D lookup_disassembler(info.architecture) if disassembler is None: