From ddae2516c12bc10a7083d052fab1baefc097a129 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Tue, 1 Dec 2015 12:04:01 +0100
Subject: [PATCH] keepkey: cmdline plugin

---
 plugins/keepkey/cmdline.py | 32 ++++++++++++++++++++++++++++++++
 plugins/keepkey/keepkey.py | 29 -----------------------------
 plugins/trezor/cmdline.py  |  2 --
 3 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 plugins/keepkey/cmdline.py

diff --git a/plugins/keepkey/cmdline.py b/plugins/keepkey/cmdline.py
new file mode 100644
index 00000000..a77a3804
--- /dev/null
+++ b/plugins/keepkey/cmdline.py
@@ -0,0 +1,32 @@
+from keepkey import KeepKeyPlugin
+from electrum.util import print_msg
+from electrum.plugins import hook
+
+class KeepKeyCmdLineHandler:
+
+    def get_passphrase(self, msg):
+        import getpass
+        print_msg(msg)
+        return getpass.getpass('')
+
+    def get_pin(self, msg):
+        t = { 'a':'7', 'b':'8', 'c':'9', 'd':'4', 'e':'5', 'f':'6', 'g':'1', 'h':'2', 'i':'3'}
+        print_msg(msg)
+        print_msg("a b c\nd e f\ng h i\n-----")
+        o = raw_input()
+        return ''.join(map(lambda x: t[x], o))
+
+    def stop(self):
+        pass
+
+    def show_message(self, msg):
+        print_msg(msg)
+
+class Plugin(KeepKeyPlugin):
+    @hook
+    def cmdline_load_wallet(self, wallet):
+        self.wallet = wallet
+        self.wallet.plugin = self
+        if self.handler is None:
+            self.handler = KeepKeyCmdLineHandler()
+
diff --git a/plugins/keepkey/keepkey.py b/plugins/keepkey/keepkey.py
index 3190d0c0..90f6556c 100644
--- a/plugins/keepkey/keepkey.py
+++ b/plugins/keepkey/keepkey.py
@@ -420,15 +420,6 @@ class KeepKeyPlugin(BasePlugin):
 
 
 
-class CmdlinePlugin(KeepKeyPlugin):
-
-    @hook
-    def cmdline_load_wallet(self, wallet):
-        self.wallet = wallet
-        self.wallet.plugin = self
-        if self.handler is None:
-            self.handler = KeepKeyCmdLineHandler()
-
 
 
 class KeepKeyGuiMixin(object):
@@ -478,26 +469,6 @@ class KeepKeyGuiMixin(object):
         return proto.WordAck(word=word)
 
 
-class KeepKeyCmdLineHandler:
-
-    def get_passphrase(self, msg):
-        import getpass
-        print_msg(msg)
-        return getpass.getpass('')
-
-    def get_pin(self, msg):
-        t = { 'a':'7', 'b':'8', 'c':'9', 'd':'4', 'e':'5', 'f':'6', 'g':'1', 'h':'2', 'i':'3'}
-        print_msg(msg)
-        print_msg("a b c\nd e f\ng h i\n-----")
-        o = raw_input()
-        return ''.join(map(lambda x: t[x], o))
-
-    def stop(self):
-        pass
-
-    def show_message(self, msg):
-        print_msg(msg)
-
 
 if KEEPKEY:
     class QtGuiKeepKeyClient(ProtocolMixin, KeepKeyGuiMixin, BaseClient):
diff --git a/plugins/trezor/cmdline.py b/plugins/trezor/cmdline.py
index dbde120c..c2bf83ea 100644
--- a/plugins/trezor/cmdline.py
+++ b/plugins/trezor/cmdline.py
@@ -27,10 +27,8 @@ class Plugin(TrezorPlugin):
 
     @hook
     def cmdline_load_wallet(self, wallet):
-        print "cmdline load wallet"
         self.wallet = wallet
         self.wallet.plugin = self
         if self.handler is None:
             self.handler = TrezorCmdLineHandler()
-        print self.wallet