From 70bc4ffa8febd2314074096674ec3a6690068437 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 20 Sep 2024 09:36:05 +0000 Subject: [PATCH] pylint: yield from --- mmgen/addrlist.py | 3 +-- mmgen/msg.py | 6 ++---- mmgen/rpc.py | 6 ++---- mmgen/share/Opts.py | 3 +-- mmgen/util.py | 3 +-- mmgen/xmrseed.py | 3 +-- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mmgen/addrlist.py b/mmgen/addrlist.py index ef03c6cb..460d4ee3 100755 --- a/mmgen/addrlist.py +++ b/mmgen/addrlist.py @@ -41,8 +41,7 @@ class AddrIdxList(tuple,InitErrors,MMGenObject): elif len(j) == 2: if j[0] > j[1]: raise ValueError(f'{i}: invalid range') - for k in range(j[0], j[1] + 1): - yield k + yield from range(j[0], j[1] + 1) else: raise ValueError(f'{i}: invalid range') idx_list = tuple(gen()) diff --git a/mmgen/msg.py b/mmgen/msg.py index 2600ac6d..224ad02d 100755 --- a/mmgen/msg.py +++ b/mmgen/msg.py @@ -163,8 +163,7 @@ class coin_msg: for n,(k,v) in enumerate(self.sigs.items()): yield '' yield f'{n+1:>3}) {k}' - for res in gen_entry(v): - yield res + yield from gen_entry(v) def gen_single(): for k,v in hdr_data.items(): @@ -176,8 +175,7 @@ class coin_msg: MMGenID(self.proto,req_addr) ) if k not in self.sigs: die(1,f'{k}: address not found in signature data') - for res in gen_entry(self.sigs[k]): - yield res + yield from gen_entry(self.sigs[k]) hdr_data = { 'message': ('Message:', grnbg ), diff --git a/mmgen/rpc.py b/mmgen/rpc.py index 18db42da..44bbf1cf 100755 --- a/mmgen/rpc.py +++ b/mmgen/rpc.py @@ -213,13 +213,11 @@ class RPCBackends: def gen_opts(): for k,v in caller.http_hdrs.items(): - for s in ('--header',f'{k}: {v}'): - yield s + yield from ('--header', f'{k}: {v}') if caller.auth_type: # Authentication with curl is insecure, as it exposes the user's credentials # via the command line. Use for testing only. - for s in ('--user',f'{caller.auth.user}:{caller.auth.passwd}'): - yield s + yield from ('--user', f'{caller.auth.user}:{caller.auth.passwd}') if caller.auth_type == 'digest': yield '--digest' if caller.network_proto == 'https' and caller.verify_server is False: diff --git a/mmgen/share/Opts.py b/mmgen/share/Opts.py index 197ec9fd..e743cf5f 100755 --- a/mmgen/share/Opts.py +++ b/mmgen/share/Opts.py @@ -106,8 +106,7 @@ def make_help(cfg,proto,opts_data,opt_filter): if 'notes' in c: arg_tuple = tuple(gen_arg_tuple(c['notes'],notes_text)) notes_text = c['notes'](*arg_tuple) - for line in notes_text.splitlines(): - yield line + yield from notes_text.splitlines() return nl.join(gen_text()) + '\n' diff --git a/mmgen/util.py b/mmgen/util.py index f23b3e25..6b49fefc 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -429,8 +429,7 @@ def get_subclasses(cls,names=False): def gen(cls): for i in cls.__subclasses__(): yield i - for j in gen(i): - yield j + yield from gen(i) return tuple((c.__name__ for c in gen(cls)) if names else gen(cls)) def async_run(coro): diff --git a/mmgen/xmrseed.py b/mmgen/xmrseed.py index 0e926cb8..96716b55 100755 --- a/mmgen/xmrseed.py +++ b/mmgen/xmrseed.py @@ -95,8 +95,7 @@ class xmrseed(baseconv): def gen(): for i in range(len(bytestr)//4): - for e in num2base_monero( int.from_bytes( bytestr[i*4:i*4+4][::-1], 'big' ) ): - yield e + yield from num2base_monero(int.from_bytes( bytestr[i*4:i*4+4][::-1], 'big' )) o = list(gen()) o.append( self.monero_mn_checksum(o) )