From 3a281391a4b12ab5583d2629e1a81c132898e740 Mon Sep 17 00:00:00 2001
From: MMGen <mmgen@tuta.io>
Date: Fri, 15 Feb 2019 17:06:16 +0000
Subject: [PATCH] Python 3 fixes for Util.py, mmnode-blocks-info,
 mmnode-play-sound, setup.py

---
 mmgen/node_tools/Util.py |  6 +++---
 mmnode-blocks-info       | 18 +++++++++---------
 mmnode-play-sound        |  8 ++++----
 setup.py                 |  1 -
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/mmgen/node_tools/Util.py b/mmgen/node_tools/Util.py
index 90ed5e2..1fcf34b 100644
--- a/mmgen/node_tools/Util.py
+++ b/mmgen/node_tools/Util.py
@@ -102,12 +102,12 @@ big_digits = {
 }
 
 _bnums_c,_bpunc_c = [[l.strip('\n') + ' ' * (big_digits[m]*big_digits['n'])
-	for l in big_digits[k][1:].decode('utf8').split('\n')]
-		for k,m in ('nums','w'),('punc','pw')]
+	for l in big_digits[k][1:].split('\n')]
+		for k,m in (('nums','w'),('punc','pw'))]
 
 _bnums_n,_bpunc_n = [[[l[0+(j*w):w+(j*w)] for l in i]
 					for j in range(big_digits[n])] for n,w,i in
-						('n',big_digits['w'],_bnums_c),('pn',big_digits['pw'],_bpunc_c)]
+						(('n',big_digits['w'],_bnums_c),('pn',big_digits['pw'],_bpunc_c))]
 
 def display_big_digits(s,pre='',suf=''):
 	s = [int((d,10,11)[(d in '.:')+(d==':')]) for d in s]
diff --git a/mmnode-blocks-info b/mmnode-blocks-info
index 4bf6d75..9852da9 100755
--- a/mmnode-blocks-info
+++ b/mmnode-blocks-info
@@ -125,26 +125,26 @@ for i in range(first,last+1):
 		if opt.hashes:
 			Msg('{:<7} {}'.format(i,b['hash']))
 		else:
-			d = (i,date,'{}:{:02}'.format(et/60,et%60),b['confirmations'],b['size'],b['versionHex'])
+			d = (i,date,'{}:{:02}'.format(et//60,et%60),b['confirmations'],b['size'],b['versionHex'])
 			if opt.miner_info:
 				bd = c.getrawtransaction(b['tx'][0],1,on_fail='silent')
 				if type(bd) == tuple:
 					Msg(fs.format(*(d+('---',))))
 				else:
 					cb = unhexlify(bd['vin'][0]['coinbase'])
-					scb = re.sub('[^\w /-:,;.]','',cb)[1:]
+					scb = re.sub(b'[^\w /-:,;.]',b'',cb)[1:]
 					if opt.raw_miner_info:
-						Msg(fs.format(*(d+(scb,))))
+						Msg(fs.format(*(d+(scb.decode(),))))
 					else:
 						for ms in miner_strings:
-							if ms in scb:
+							if ms.encode() in scb:
 								s = miner_strings[ms]
 								break
 						else:
 							try:    s = scb.split('ined by')[1].strip()
 							except: s = '??'
-						nya_str = ('    ','NYA ')['NYA' in scb] if opt.nya else ''
-						Msg(fs.format(*(d+(nya_str+s,))))
+						nya_str = (b'    ',b'NYA ')[b'NYA' in scb] if opt.nya else b''
+						Msg(fs.format(*(d+(nya_str.decode()+s,))))
 			else:
 				Msg(fs.format(*d))
 
@@ -159,9 +159,9 @@ else:
 	if blocks > 1:
 		fs2 = '{:<15} {}\n'
 		et = b['mediantime'] - first_time
-		ac = et / blocks
+		ac = int(et / blocks)
 		if not opt.summary: Msg('')
 		Msg_r(  fs2.format('Range:','{}-{} ({} blocks)'.format(first,last,blocks)) +
-				fs2.format('Avg size:',total/blocks) +
+				fs2.format('Avg size:','{} bytes'.format(total//blocks)) +
 				fs2.format('MB/hr:','{:0.5f}'.format(float(total)*36/10000/et)) +
-				fs2.format('Avg conf time:','{}:{:02}'.format(ac/60,ac%60)))
+				fs2.format('Avg conf time:','{}:{:02}'.format(ac//60,ac%60)))
diff --git a/mmnode-play-sound b/mmnode-play-sound
index dbe2087..9ed3696 100755
--- a/mmnode-play-sound
+++ b/mmnode-play-sound
@@ -21,9 +21,9 @@ mmnode-play-sound: play a sound with controlled volume
 """
 
 import sys
+from mmgen.common import *
 from mmgen.util import die
 from mmgen.node_tools.Sound import *
-from mmgen.share import Opts
 volume = 100
 
 opts_data = lambda: {
@@ -36,10 +36,10 @@ opts_data = lambda: {
 """.format(volume)
 }
 
-opts,args = Opts.parse_opts(sys.argv,opts_data)[:2]
+args = opts.init(opts_data)
 
-if 'volume' in opts:
-	volume = opts['volume']
+if opt.volume:
+	volume = opt.volume
 	try:
 		volume = int(volume)
 		assert 1 <= volume <= 120
diff --git a/setup.py b/setup.py
index 484dd48..d293ab9 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,6 @@ setup(
 		keywords     = g.keywords,
 		packages     = ['mmgen.node_tools'],
 		scripts      = [
-			'btc-ticker',
 			'mmnode-play-sound',
 			'mmnode-netrate',
 			'mmnode-peerblocks',