From 02ff2dd94aae20c09410ba6f9b1c6143aa930b39 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 20 Sep 2024 09:36:05 +0000 Subject: [PATCH] pylint: branch logic --- mmgen/bip_hd/__init__.py | 3 +-- mmgen/cfg.py | 4 ++-- mmgen/crypto.py | 3 +-- mmgen/daemon.py | 3 +-- mmgen/objmethods.py | 3 +-- mmgen/proto/eth/tw/ctl.py | 15 ++++----------- mmgen/proto/zec/params.py | 3 +-- mmgen/subseed.py | 4 ++-- mmgen/tw/addresses.py | 3 +-- mmgen/tx/info.py | 5 ++--- mmgen/util2.py | 6 ++---- 11 files changed, 18 insertions(+), 34 deletions(-) diff --git a/mmgen/bip_hd/__init__.py b/mmgen/bip_hd/__init__.py index d70aa5b6..723adb6e 100644 --- a/mmgen/bip_hd/__init__.py +++ b/mmgen/bip_hd/__init__.py @@ -51,8 +51,7 @@ def parse_version_bytes(vb_hex): for e in chainparams_data[f'bip-{bipnum}'].values(): if vb_hex in (e.vb_pub, e.vb_prv): return (bipnum, e) - else: - raise ValueError(f'0x{vb_hex}: unrecognized extended key version bytes') + raise ValueError(f'0x{vb_hex}: unrecognized extended key version bytes') def compress_pubkey(pubkey_bytes): # see: proto.secp256k1.keygen.pubkey_format() diff --git a/mmgen/cfg.py b/mmgen/cfg.py index c0e3092d..e996f597 100755 --- a/mmgen/cfg.py +++ b/mmgen/cfg.py @@ -543,13 +543,13 @@ class Config(Lockable): for name,val in ((k,v) for k,v in os.environ.items() if k.startswith('MMGEN_')): if name == 'MMGEN_DEBUG_ALL': continue - elif name in self._env_opts: + if name in self._env_opts: if val: # ignore empty string values; string value of '0' or 'false' sets variable to False disable = name.startswith('MMGEN_DISABLE_') gname = name[(6,14)[disable]:].lower() if gname in self._uopts: # don’t touch attr if already set by user continue - elif hasattr(self,gname): + if hasattr(self,gname): setattr( self, gname, diff --git a/mmgen/crypto.py b/mmgen/crypto.py index 9e0d2aeb..23174385 100755 --- a/mmgen/crypto.py +++ b/mmgen/crypto.py @@ -380,8 +380,7 @@ class Crypto: if pw == pw_chk: self.util.vmsg('Passphrases match') break - else: - msg('Passphrases do not match. Try again.') + msg('Passphrases do not match. Try again.') else: die(2,f'User failed to duplicate passphrase in {gc.passwd_max_tries} attempts') diff --git a/mmgen/daemon.py b/mmgen/daemon.py index c037a48f..1c33d6a8 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -239,8 +239,7 @@ class Daemon(Lockable): if self.state == req_state: return True time.sleep(0.2) - else: - die(2,f'Wait for state {req_state!r} timeout exceeded for {self.desc} (port {self.bind_port})') + die(2,f'Wait for state {req_state!r} timeout exceeded for {self.desc} (port {self.bind_port})') @classmethod def get_exec_version_str(cls): diff --git a/mmgen/objmethods.py b/mmgen/objmethods.py index 52bec7e3..bda1da28 100755 --- a/mmgen/objmethods.py +++ b/mmgen/objmethods.py @@ -39,8 +39,7 @@ def truncate_str(s,width): # width = screen width return s[:n-1] + ('',' ')[ unicodedata.east_asian_width(ch) in ('F','W') and n + wide_count == width + 1] - else: - raise ValueError('string requires no truncating') + raise ValueError('string requires no truncating') class Hilite: diff --git a/mmgen/proto/eth/tw/ctl.py b/mmgen/proto/eth/tw/ctl.py index 63a45705..d90a3261 100755 --- a/mmgen/proto/eth/tw/ctl.py +++ b/mmgen/proto/eth/tw/ctl.py @@ -119,9 +119,8 @@ class EthereumTwCtl(TwCtl): del r[k] self.write() return ret - else: - msg(f'Address {addr!r} not found in {self.data_root_desc!r} section of tracking wallet') - return None + msg(f'Address {addr!r} not found in {self.data_root_desc!r} section of tracking wallet') + return None @write_mode async def set_label(self,coinaddr,lbl): @@ -130,28 +129,22 @@ class EthereumTwCtl(TwCtl): d['comment'] = lbl.comment self.write() return True - else: - msg(f'Address {coinaddr!r} not found in {self.data_root_desc!r} section of tracking wallet') - return False + msg(f'Address {coinaddr!r} not found in {self.data_root_desc!r} section of tracking wallet') + return False async def addr2sym(self,req_addr): for addr in self.data['tokens']: if addr == req_addr: return self.data['tokens'][addr]['params']['symbol'] - else: - return None async def sym2addr(self,sym): for addr in self.data['tokens']: if self.data['tokens'][addr]['params']['symbol'] == sym.upper(): return addr - else: - return None def get_token_param(self,token,param): if token in self.data['tokens']: return self.data['tokens'][token]['params'].get(param) - return None @property def sorted_list(self): diff --git a/mmgen/proto/zec/params.py b/mmgen/proto/zec/params.py index fb85f8df..e85306a9 100755 --- a/mmgen/proto/zec/params.py +++ b/mmgen/proto/zec/params.py @@ -40,8 +40,7 @@ class mainnet(mainnet): for v in self.wif_ver_bytes.values(): if key_data[:len(v)] == v: return len(v) - else: - raise ValueError('Invalid WIF version number') + raise ValueError('Invalid WIF version number') def get_addr_len(self,addr_fmt): return (20,64)[addr_fmt in ('zcash_z','viewkey')] diff --git a/mmgen/subseed.py b/mmgen/subseed.py index 7fce4e87..0f061031 100755 --- a/mmgen/subseed.py +++ b/mmgen/subseed.py @@ -194,8 +194,8 @@ class SubSeedList(MMGenObject): else: self.data[length][sid] = (idx,nonce) return last_sid == sid - else: # must exit here, as this could leave self.data in inconsistent state - die( 'SubSeedNonceRangeExceeded', 'add_subseed(): nonce range exceeded' ) + # must exit here, as this could leave self.data in inconsistent state + die('SubSeedNonceRangeExceeded', 'add_subseed(): nonce range exceeded') for idx in SubSeedIdxRange(first_idx,last_idx).iterate(): match1 = add_subseed(idx,'long') diff --git a/mmgen/tw/addresses.py b/mmgen/tw/addresses.py index 7d9a9cd2..413946d5 100755 --- a/mmgen/tw/addresses.py +++ b/mmgen/tw/addresses.py @@ -279,8 +279,7 @@ class TwAddresses(TwView): for e in self.data: if e.addr == coinaddr: return bool(e.recvd) - else: # addr not in tracking wallet - return None + return None # addr not in tracking wallet def get_change_address(self, al_id, bot=None, top=None, exclude=None): """ diff --git a/mmgen/tx/info.py b/mmgen/tx/info.py index fa1b85e4..46bc1b98 100755 --- a/mmgen/tx/info.py +++ b/mmgen/tx/info.py @@ -103,14 +103,13 @@ class TxInfo: msg('') if reply == '' or reply in 'Nn': break - elif reply in 'YyVvTt': + if reply in 'YyVvTt': self.view( pager = reply in 'Vv', pause = pause, terse = reply in 'Tt' ) break - else: - msg('Invalid reply') + msg('Invalid reply') def view(self,pager=False,pause=True,terse=False): o = self.format(terse=terse) diff --git a/mmgen/util2.py b/mmgen/util2.py index 66edadbd..2f8c8e7c 100755 --- a/mmgen/util2.py +++ b/mmgen/util2.py @@ -93,8 +93,7 @@ def int2bytespec(n,spec,fmt,print_sym=True,strip=False,add_space=False): for k,v in bytespec_map: if k == spec: return v - else: - die(1,f'{spec!r}: unrecognized bytespec') + die(1,f'{spec!r}: unrecognized bytespec') ret = f'{n/spec2int(spec):{fmt}f}' if strip: @@ -116,8 +115,7 @@ def parse_bytespec(nbytes): if k == m.group(2): from decimal import Decimal return int(Decimal(m.group(1)) * v) - else: - msg("Valid byte specifiers: '{}'".format("' '".join([i[0] for i in bytespec_map]))) + msg("Valid byte specifiers: '{}'".format("' '".join([i[0] for i in bytespec_map]))) elif '.' in nbytes: raise ValueError('fractional bytes not allowed') else: