From e16476bab9f5efa67a37cdc7c3a28b8787cc0426 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Wed, 23 Mar 2016 02:55:47 +0300 Subject: [PATCH] => Python3 --- contrib/seeds/getseeds.py | 61 ++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/contrib/seeds/getseeds.py b/contrib/seeds/getseeds.py index 2d61795..fb0f157 100755 --- a/contrib/seeds/getseeds.py +++ b/contrib/seeds/getseeds.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 ### ### Automatic seeding over HTTP @@ -11,16 +11,15 @@ import os import sys import json import random -import urllib2 import platform - +import urllib.request sources = ['http://dalexhz1.cloudapp.net', 'http://dalexhz2.cloudapp.net', 'http://dalexhz4.cloudapp.net', 'http://dalexhz5.cloudapp.net'] -data = urllib2.urlopen(random.choice(sources)) +data = urllib.request.urlopen(random.choice(sources)).readall(); if 'norpc' in sys.argv: - for node in json.load(data): - print node + for node in json.loads(data.decode()): + print (node) sys.exit() ### This module is required to function properly: @@ -57,45 +56,45 @@ conf = open(conf_path, 'rb').read() contents = {} for line in conf.splitlines(True): - if '#' in line: + if line.startswith(b'#'): line = line[:line.index('#')] - if '=' not in line: + if not line.__contains__(b'='): continue - k, v = line.split('=', 1) + k, v = line.split(b'=', 1) contents[k.strip()] = v.strip() -if 'rpcpassword' not in contents.keys(): - parser.error( - '''RPC password is not found in the %s file.''' % (conf_path)) - -rpcuser = 'novacoin' -rpcpassword = contents['rpcpassword'] -rpcport = 8344 -rpclisten = '127.0.0.1' +print(contents) -if 'rpcport' in contents.keys(): - rpcport = contents['rpcport'] +if b'rpcpassword' not in contents.keys(): + print('''RPC password is not found in the %s file.''' % (conf_path)) + sys.exit() -if 'rpcuser' in contents.keys(): - rpcuser = contents['rpcuser'] +if b'rpcuser' not in contents.keys(): + print('''RPC user is not found in the %s file.''' % (conf_path)) + sys.exit() -if 'rpclisten' in contents.keys(): - rpcuser = contents['rpclisten'] +rpcuser = contents[b'rpcuser'].decode() +rpcpassword = contents[b'rpcpassword'].decode() +rpcport = 8344 +rpclisten = '127.0.0.1' -url = "http://"+rpcuser+":"+rpcpassword+"@"+rpclisten+":"+rpcport+"/" +if b'rpcport' in contents.keys(): + rpcport = contents[b'rpcport'].decode() +if b'rpclisten' in contents.keys(): + rpcuser = contents[b'rpclisten'].decode() -access = AuthServiceProxy(url) +access = AuthServiceProxy("http://"+rpcuser+":"+rpcpassword+"@"+rpclisten+":"+rpcport+"/") -for node in json.load(data): - print 'Adding', node +for node in json.loads(data.decode()): + print ('Adding', node) try: access.addnode(node, 'add') - except socket_error, e: + except socket_error as e: if e.errno == errno.ECONNREFUSED: - print 'Unable to communicate with Novacoin RPC' + print ('Unable to communicate with Novacoin RPC') break - except JSONRPCException, e: + except JSONRPCException as e: if e.code == -23: - print 'Already added' + print ('Already added') continue break -- 1.7.1