electrum

commit 2c51b0aa14564a0f3e40ffd9a68ec5fa4d26a978
parent 107a0bd2787838a14248de8e8b585fa2e94b7c9e
Author: ThomasV <thomasv@gitorious>
Date:   Fri, 29 Aug 2014 12:27:10 +0200

update mnemonic imports

Diffstat:
M
gui/gtk.py
 | 
2
+-
M
gui/stdio.py
 | 
2
+-
M
lib/bitcoin.py
 | 
4
++--

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gui/gtk.py b/gui/gtk.py
@@ -26,7 +26,7 @@ from gi.repository import Gtk, Gdk, GObject, cairo
 from decimal import Decimal
 from electrum.util import print_error
 from electrum.bitcoin import is_valid
-from electrum import mnemonic, WalletStorage, Wallet
+from electrum import WalletStorage, Wallet
 
 Gdk.threads_init()
 APP_NAME = "Electrum"
diff --git a/gui/stdio.py b/gui/stdio.py
@@ -1,7 +1,7 @@
 from decimal import Decimal
 _ = lambda x:x
 #from i18n import _
-from electrum import mnemonic_encode, WalletStorage, Wallet
+from electrum.wallet import WalletStorage, Wallet
 from electrum.util import format_satoshis, set_verbosity
 from electrum.bitcoin import is_valid
 from electrum.network import filter_protocol
diff --git a/lib/bitcoin.py b/lib/bitcoin.py
@@ -115,10 +115,10 @@ is_new_seed = lambda x: hmac_sha_512("Seed version", x.encode('utf8')).encode('h
 
 
 def is_old_seed(seed):
-    import mnemonic
+    import old_mnemonic
     words = seed.strip().split()
     try:
-        mnemonic.mn_decode(words)
+        old_mnemonic.mn_decode(words)
         uses_electrum_words = True
     except Exception:
         uses_electrum_words = False