electrum

commit c22f839c9ee2f4e2580afb09a4a8ec7a1c2ccc20
parent 87e4131623a42b55a3fe960913745bd3362aa63c
Author: thomasv <thomasv@gitorious>
Date:   Wed, 22 Feb 2012 16:17:24 +0100

use real auth

Diffstat:
M
client/electrum
 | 
14
+-------------
M
client/wallet.py
 | 
4
++--

2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/client/electrum b/client/electrum
@@ -46,19 +46,7 @@ if __name__ == '__main__':
     interface = Interface()
     wallet = Wallet(interface)
     wallet.set_path(options.wallet_path)
-
-    if options.remote_url:
-        m = re.match('^(.*?)@(.*?)$', options.remote_url)
-        # header authentication is not supported
-        if m:
-            wallet.remote_url = 'http://'+m.group(2)
-            wallet.remote_password = m.group(1)
-        else:
-            print "bad url"
-            sys.exit(1)
-    else:
-        wallet.remote_url = None
-    
+    wallet.remote_url = options.remote_url
 
     if len(args)==0:
         url = None
diff --git a/client/wallet.py b/client/wallet.py
@@ -491,13 +491,13 @@ class Wallet:
     def get_remote_number(self):
         import jsonrpclib
         server = jsonrpclib.Server(self.remote_url)
-        out = server.getnum(self.remote_password)
+        out = server.getnum()
         return out
 
     def get_remote_mpk(self):
         import jsonrpclib
         server = jsonrpclib.Server(self.remote_url)
-        out = server.getkey(self.remote_password)
+        out = server.getkey()
         return out
 
     def is_found(self):