Merge branch 'master' of git://gitorious.org/electrum/electrum

2012-03-12 17:55:59 +01:00
parent 0fc0bdd667 9e7098bb4a
commit 69ca6a3074
3 changed files with 3 additions and 2 deletions
--- a/client/remote_wallet.py
+++ b/client/remote_wallet.py
@@ -86,7 +86,7 @@ if __name__ == '__main__':

    if len(sys.argv)>1:
        import jsonrpclib
-        server = jsonrpclib.Server('http://%s:%d'%(host,port))
+        server = jsonrpclib.Server('http://%s:%s@%s:%d'%(username, password, host, port))
        cmd = sys.argv[1]

        try: