Merge pull request #3649

3078b58 linearize.py: Harmonize rpcpass to rpcpassword (Subo1978)

Author: laanwj

contrib/linearize/example-linearize.cfg

@@ -1,7 +1,7 @@
 
 # bitcoind RPC settings
 rpcuser=someuser
-rpcpass=somepassword
+rpcpassword=somepassword
 host=127.0.0.1
 port=8332
 

contrib/linearize/linearize.py

@@ -71,7 +71,7 @@ def getblock(rpc, settings, n):
 
 def get_blocks(settings):
 	rpc = BitcoinRPC(settings['host'], settings['port'],
-			 settings['rpcuser'], settings['rpcpass'])
+			 settings['rpcuser'], settings['rpcpassword'])
 
 	outf = open(settings['output'], 'ab')
 
@@ -118,7 +118,7 @@ def get_blocks(settings):
 		settings['min_height'] = 0
 	if 'max_height' not in settings:
 		settings['max_height'] = 279000
-	if 'rpcuser' not in settings or 'rpcpass' not in settings:
+	if 'rpcuser' not in settings or 'rpcpassword' not in settings:
 		print "Missing username and/or password in cfg file"
 		sys.exit(1)