From 1a3f11ba51289ac7c44e2eafb0daf0eed26edf3a Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 26 Oct 2026 13:36:48 +0000 Subject: [PATCH] ruff exceptions: various --- mmgen/fileutil.py | 4 ++-- mmgen/msg.py | 2 +- mmgen/term.py | 4 ++-- mmgen/tx/new_swap.py | 4 ++-- test/cmdtest_d/base.py | 2 +- test/cmdtest_d/include/common.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mmgen/fileutil.py b/mmgen/fileutil.py index 0d50a69d..d3208630 100644 --- a/mmgen/fileutil.py +++ b/mmgen/fileutil.py @@ -287,8 +287,8 @@ def get_words_from_file(cfg, infile, *, desc, quiet=False): try: words = data.decode().split() - except: - die(1, f'{capfirst(desc)} data must be UTF-8 encoded.') + except UnicodeError as e: + die(1, f'{capfirst(desc)} data must be UTF-8 encoded ({e})') cfg._util.dmsg('Sanitized input: [{}]'.format(' '.join(words))) diff --git a/mmgen/msg.py b/mmgen/msg.py index 0b352ac1..3261fbb6 100644 --- a/mmgen/msg.py +++ b/mmgen/msg.py @@ -362,7 +362,7 @@ def _get_obj(clsname, cfg, *args, coin=None, network='mainnet', infile=None, dat try: msg_cls = importlib.import_module( f'mmgen.proto.{proto.base_proto_coin.lower()}.msg').coin_msg - except: + except ImportError: die(1, f'Message signing operations not supported for {proto.base_proto} protocol') me = MMGenObject.__new__(getattr(msg_cls, clsname, getattr(coin_msg, clsname))) diff --git a/mmgen/term.py b/mmgen/term.py index 77296806..5ba81a49 100644 --- a/mmgen/term.py +++ b/mmgen/term.py @@ -34,8 +34,8 @@ match gc.platform: case 'win32': try: import msvcrt # pylint: disable=import-error - except: - die(2, 'Unable to set terminal mode') + except ImportError as e: + die(2, f'Unable to set terminal mode ({e})') if not sys.stdin.isatty(): msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) case x: diff --git a/mmgen/tx/new_swap.py b/mmgen/tx/new_swap.py index 9fdf1fba..a78837ab 100644 --- a/mmgen/tx/new_swap.py +++ b/mmgen/tx/new_swap.py @@ -25,7 +25,7 @@ from .new import New def get_send_proto(cfg): try: arg = cfg._args.pop(0) - except: + except IndexError: cfg._usage() return init_swap_proto(cfg, get_swap_asset(cfg, arg, direction='send')) @@ -93,7 +93,7 @@ class NewSwap(BaseSwapMethods, New): def get_arg(): try: return args_in.pop(0) - except: + except IndexError: self.cfg._usage() async def parse(): diff --git a/test/cmdtest_d/base.py b/test/cmdtest_d/base.py index bd79f79a..d760c90b 100644 --- a/test/cmdtest_d/base.py +++ b/test/cmdtest_d/base.py @@ -148,6 +148,6 @@ class CmdTestBase: imsg(purple(f'Killing {desc} [PID {pid}]')) try: os.kill(pid, SIGTERM) - except: + except ProcessLookupError: imsg(yellow(f'{pid}: no such process')) return 'ok' diff --git a/test/cmdtest_d/include/common.py b/test/cmdtest_d/include/common.py index 7586aa4f..4a4a64be 100644 --- a/test/cmdtest_d/include/common.py +++ b/test/cmdtest_d/include/common.py @@ -175,7 +175,7 @@ def get_comment(do_shuffle=False): global label_iter try: return next(label_iter) - except: + except (NameError, StopIteration): if do_shuffle: shuffle(labels) label_iter = iter(labels)