tMerge pull request #3087 from SomberNight/fix_contacts_import - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 02cd5497eb5acd8f490f1bd1925883b1a3fdfed1
DIR parent 9615279c3d86cdd1f1b44a610e1bf35dd0ed826d
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 22 Oct 2017 14:43:08 +0200
Merge pull request #3087 from SomberNight/fix_contacts_import
fix: contacts import
Diffstat:
M gui/qt/contact_list.py | 2 +-
M lib/contacts.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/contact_list.py b/gui/qt/contact_list.py
t@@ -72,7 +72,7 @@ class ContactList(MyTreeWidget):
selected = self.selectedItems()
if not selected:
menu.addAction(_("New contact"), lambda: self.parent.new_contact_dialog())
- menu.addAction(_("Import file"), lambda: self.parent.import_contacts())
+ menu.addAction(_("Import file"), lambda: self.import_contacts())
else:
names = [item.text(0) for item in selected]
keys = [item.text(1) for item in selected]
DIR diff --git a/lib/contacts.py b/lib/contacts.py
t@@ -123,7 +123,7 @@ class Contacts(dict):
return None
def _validate(self, data):
- for k,v in data.items():
+ for k,v in list(data.items()):
if k == 'contacts':
return self._validate(v)
if not bitcoin.is_address(k):