From 88039bb3c159b86ce9aaa7a25297b07d8c9cfc3f Mon Sep 17 00:00:00 2001
From: MMGen <mmgen@tuta.io>
Date: Fri, 8 Feb 2019 12:06:03 +0000
Subject: [PATCH] py3port: minor fixes

---
 mmgen/altcoins/eth/tw.py | 2 +-
 mmgen/rpc.py             | 4 ++--
 mmgen/seed.py            | 4 ++--
 test/test.py             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mmgen/altcoins/eth/tw.py b/mmgen/altcoins/eth/tw.py
index bd5b84fc..4cd36def 100755
--- a/mmgen/altcoins/eth/tw.py
+++ b/mmgen/altcoins/eth/tw.py
@@ -46,7 +46,7 @@ class EthereumTrackingWallet(TrackingWallet):
 			except:
 				self.orig_data = ''
 				self.data = {'coin':g.coin,'accounts':{},'tokens':{}}
-			else: die(2,"File '{}' exists but does not contain valid json data")
+			else: die(2,"File '{}' exists but does not contain valid json data".format(self.tw_file))
 		else:
 			self.upgrade_wallet_maybe()
 			m = 'Tracking wallet coin ({}) does not match current coin ({})!'
diff --git a/mmgen/rpc.py b/mmgen/rpc.py
index 9d61f440..2a6daeb7 100755
--- a/mmgen/rpc.py
+++ b/mmgen/rpc.py
@@ -145,7 +145,7 @@ class CoinDaemonRPCConnection(object):
 			if cf['on_fail'] not in ('silent','raise'):
 				msg_r(yellow('{} RPC Error: '.format(g.proto.daemon_name.capitalize())))
 				msg(red('{} {}'.format(r.status,r.reason)))
-			e1 = r.read()
+			e1 = r.read().decode()
 			try:
 				e3 = json.loads(e1)['error']
 				e2 = '{} (code {})'.format(e3['message'],e3['code'])
@@ -153,7 +153,7 @@ class CoinDaemonRPCConnection(object):
 				e2 = str(e1)
 			return do_fail(r,1,e2)
 
-		r2 = r.read()
+		r2 = r.read().decode()
 
 		dmsg_rpc('    RPC REPLY data ==> {}\n'.format(r2))
 
diff --git a/mmgen/seed.py b/mmgen/seed.py
index ff14cd37..56abe49d 100755
--- a/mmgen/seed.py
+++ b/mmgen/seed.py
@@ -450,8 +450,8 @@ class Mnemonic (SeedSourceUnenc):
 		mn = self.fmt_data.split()
 
 		if len(mn) not in self.mn_lens:
-			msg('Invalid mnemonic ({} words).  Valid numbers of words: {}'.format(
-					(len(mn),', '.join(map(str,self.mn_lens)))))
+			m = 'Invalid mnemonic ({} words).  Valid numbers of words: {}'
+			msg(m.format(len(mn),', '.join(map(str,self.mn_lens))))
 			return False
 
 		for n,w in enumerate(mn,1):
diff --git a/test/test.py b/test/test.py
index cb7f6e16..7521fc87 100755
--- a/test/test.py
+++ b/test/test.py
@@ -2781,7 +2781,7 @@ class MMGenTestSuite(object):
 				t.expect(['Passphrase is OK',' are correct'])
 		# Output
 		wf = t.written_to_file('Mnemonic data',oo=oo)
-		t.close()
+		t.p.wait()
 		t.ok()
 		# back check of result
 		if opt.profile: msg('')