tupdate imports - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b0b4dfaa186dc1b8621ff947051360447320c092
DIR parent 5e3f92b83fe18addd1e0e932da6280977f742fbd
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 19 Jan 2012 19:27:53 +0300
update imports
Diffstat:
M server/server.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
DIR diff --git a/server/server.py b/server/server.py
t@@ -38,7 +38,8 @@ import urllib
# we need to import electrum
sys.path.append('../client/')
-import electrum
+from wallet import Wallet
+from interface import Interface
config = ConfigParser.ConfigParser()
t@@ -324,7 +325,7 @@ class MyStore(Datastore_class):
-class Direct_Interface(electrum.Interface):
+class Direct_Interface(Interface):
def __init__(self):
pass
t@@ -522,7 +523,7 @@ def do_command(cmd, data, ipaddr):
master_public_key = k.decode('hex') # todo: sanitize. no need to decode twice...
print master_public_key
wallet_id = random_string(10)
- w = electrum.Wallet( Direct_Interface() )
+ w = Wallet( Direct_Interface() )
w.master_public_key = master_public_key.decode('hex')
w.synchronize()
wallets[wallet_id] = w
t@@ -530,7 +531,7 @@ def do_command(cmd, data, ipaddr):
print "wallets", wallets
elif cmd == 'bccapi_getAccountInfo':
- from electrum import int_to_hex
+ from wallet import int_to_hex
v, wallet_id = ast.literal_eval(data)
w = wallets.get(wallet_id)
if w is not None:
t@@ -543,7 +544,7 @@ def do_command(cmd, data, ipaddr):
out = "error"
elif cmd == 'bccapi_getAccountStatement':
- from electrum import int_to_hex
+ from wallet import int_to_hex
v, wallet_id = ast.literal_eval(data)
w = wallets.get(wallet_id)
if w is not None: