Passphrase-related fixes

Move normalize code to one place on the wallet
Passphrases don't have password strength meter

plugins/trezor/plugin.py

@@ -3,7 +3,6 @@ import time
 
 from binascii import unhexlify
 from struct import pack
-from unicodedata import normalize
 
 from electrum.account import BIP32_Account
 from electrum.bitcoin import (bc_address_to_hash_160, xpub_from_pubkey,
@@ -154,8 +153,10 @@ class TrezorCompatiblePlugin(BasePlugin):
 
     @hook
     def timer_actions(self):
+        # Scan connected devices every second.  The test for libraries
+        # available is necessary to recover wallets on machines without
+        # libraries
         if self.libraries_available:
-            # Scan connected devices every second
             now = time.time()
             if now > self.last_scan + 1:
                 self.last_scan = now
@@ -294,10 +295,6 @@ class TrezorCompatiblePlugin(BasePlugin):
     def is_enabled(self):
         return self.libraries_available
 
-    @staticmethod
-    def normalize_passphrase(self, passphrase):
-        return normalize('NFKD', unicode(passphrase or ''))
-
     def on_restore_wallet(self, wallet, wizard):
         assert isinstance(wallet, self.wallet_class)
 

plugins/trezor/qt_generic.py

@@ -11,6 +11,7 @@ from plugin import TrezorCompatiblePlugin
 from electrum.i18n import _
 from electrum.plugins import hook
 from electrum.util import PrintError
+from electrum.wallet import BIP44_Wallet
 
 
 # By far the trickiest thing about this handler is the window stack;
@@ -75,7 +76,7 @@ class QtHandler(PrintError):
                            PasswordDialog.PW_PASSPHRASE)
         confirmed, p, passphrase = d.run()
         if confirmed:
-            passphrase = TrezorCompatiblePlugin.normalize_passphrase(passphrase)
+            passphrase = BIP44_Wallet.normalize_passphrase(passphrase)
         self.passphrase = passphrase
         self.done.set()