From 4b6772dc3b15ac3b8145d017478b779862d45b56 Mon Sep 17 00:00:00 2001 From: MMGen Date: Sat, 16 Mar 2019 19:05:25 +0000 Subject: [PATCH] py3port: use set comprehensions where applicable --- mmgen/obj.py | 2 +- mmgen/tool.py | 2 +- mmgen/tx.py | 4 ++-- mmgen/txsign.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mmgen/obj.py b/mmgen/obj.py index 392d36a1..b8bca224 100755 --- a/mmgen/obj.py +++ b/mmgen/obj.py @@ -283,7 +283,7 @@ class AddrIdxList(list,InitErrors,MMGenObject): self.arg_chk(type(self),on_fail) try: if idx_list: - return list.__init__(self,sorted(set(AddrIdx(i,on_fail='raise') for i in idx_list))) + return list.__init__(self,sorted({AddrIdx(i,on_fail='raise') for i in idx_list})) elif fmt_str: ret = [] for i in (fmt_str.split(sep)): diff --git a/mmgen/tool.py b/mmgen/tool.py index ce09e8d3..02553c23 100755 --- a/mmgen/tool.py +++ b/mmgen/tool.py @@ -706,7 +706,7 @@ class MMGenToolCmdRPC(MMGenToolCmdBase): if sort: sort = set(sort.split(',')) - sort_params = set(['reverse','age']) + sort_params = {'reverse','age'} if not sort.issubset(sort_params): die(1,"The sort option takes the following parameters: '{}'".format("','".join(sort_params))) diff --git a/mmgen/tx.py b/mmgen/tx.py index ab077c4c..10f6253e 100755 --- a/mmgen/tx.py +++ b/mmgen/tx.py @@ -669,7 +669,7 @@ Selected non-{pnm} inputs: {{}}""".strip().format(pnm=g.proj_name,pnl=g.proj_nam 'Transaction file size exceeds limit ({} bytes)'.format(g.max_tx_file_size)) def get_non_mmaddrs(self,desc): - return list(set(i.addr for i in getattr(self,desc) if not i.mmid)) + return {i.addr for i in getattr(self,desc) if not i.mmid} def sign(self,tx_num_str,keys): # return True or False; don't exit or raise exception @@ -1329,7 +1329,7 @@ Selected non-{pnm} inputs: {{}}""".strip().format(pnm=g.proj_name,pnl=g.proj_nam non_mmaddrs = [i for i in sel_unspent if i.twmmid.type == 'non-mmgen'] if non_mmaddrs and self.caller != 'txdo': msg(self.msg_non_mmgen_inputs.format( - ', '.join(set(sorted([a.addr.hl() for a in non_mmaddrs]))))) + ', '.join(sorted({a.addr.hl() for a in non_mmaddrs})))) if not (opt.yes or keypress_confirm('Accept?')): continue diff --git a/mmgen/txsign.py b/mmgen/txsign.py index 3934f754..9f7bef7f 100755 --- a/mmgen/txsign.py +++ b/mmgen/txsign.py @@ -60,7 +60,7 @@ def get_seed_for_seed_id(sid,infiles,saved_seeds): def generate_kals_for_mmgen_addrs(need_keys,infiles,saved_seeds): mmids = [e.mmid for e in need_keys] - sids = set(i.sid for i in mmids) + sids = {i.sid for i in mmids} vmsg('Need seed{}: {}'.format(suf(sids,'s'),' '.join(sids))) d = MMGenList() from mmgen.addr import KeyAddrList