Merge #168: look for .cookie file in datadir if specified

e080ec2 look for .cookie file in datadir if specified (Jon Larimer)

Pull request description:

  If datadir is specified in bitcoin.conf, bitcoind will write the .cookie file there.

Tree-SHA512: a281b4577c5bd51e01e1384988e01b97945b9b1998dd8b3933c16cf9f999c4ec309cf4fb060ec913c1b83eb651b27379fef1a0e68029a6e5212d8cb8b8ed8085

Author: petertodd

bitcoin/rpc.py

@@ -162,7 +162,7 @@ def __init__(self,
                 service_url = ('%s://%s:%d' %
                     ('http', conf['rpchost'], conf['rpcport']))
 
-                cookie_dir = os.path.dirname(btc_conf_file)
+                cookie_dir = conf.get('datadir', os.path.dirname(btc_conf_file))
                 if bitcoin.params.NAME != "mainnet":
                     cookie_dir = os.path.join(cookie_dir, bitcoin.params.NAME)
                 cookie_file = os.path.join(cookie_dir, ".cookie")