electrum

commit b8e4ce9ba1d3e8c600bd4f1ebe8055fb42d1152d
parent aa37979100b9119414026862444bfdb13295e6d3
Author: SomberNight <somber.night@protonmail.com>
Date:   Mon, 18 Nov 2019 18:13:26 +0100

hardware wallets: handle when label is None

follow-up 56c3de0e1eb28f6017286f51c37c5c45b86690bd

Diffstat:
M
electrum/plugin.py
 | 
4
++--
M
electrum/plugins/hw_wallet/plugin.py
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/electrum/plugin.py b/electrum/plugin.py
@@ -314,7 +314,7 @@ class HardwarePluginToScan(NamedTuple):
     exception: Optional[Exception]
 
 
-PLACEHOLDER_HW_CLIENT_LABELS = {"", " "}
+PLACEHOLDER_HW_CLIENT_LABELS = {None, "", " "}
 
 
 class DeviceMgr(ThreadJob):
@@ -511,7 +511,7 @@ class DeviceMgr(ThreadJob):
               'receive will be unspendable.').format(plugin.device))
 
     def unpaired_device_infos(self, handler, plugin: 'HW_PluginBase', devices: List['Device'] = None,
-                              include_failing_clients=False):
+                              include_failing_clients=False) -> List['DeviceInfo']:
         '''Returns a list of DeviceInfo objects: one for each connected,
         unpaired device accepted by the plugin.'''
         if not plugin.libraries_available:
diff --git a/electrum/plugins/hw_wallet/plugin.py b/electrum/plugins/hw_wallet/plugin.py
@@ -159,7 +159,7 @@ class HardwareClientBase:
         """True if initialized, False if wiped."""
         raise NotImplementedError()
 
-    def label(self) -> str:
+    def label(self) -> Optional[str]:
         """The name given by the user to the device.
 
         Note: labels are shown to the user to help distinguish their devices,