tMerge pull request #2926 from benma/dbb_py3_2 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6dfd3a0cabbb1bf2040773984cf19aed280d30e4
DIR parent 952049f74bd69c3b452c0c2aa20ba5ccb42ec48a
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 25 Sep 2017 06:28:42 +0200
Merge pull request #2926 from benma/dbb_py3_2
digitalbitbox: fixed some more python3 issues
Diffstat:
M plugins/digitalbitbox/digitalbitbo… | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/digitalbitbox/digitalbitbox.py b/plugins/digitalbitbox/digitalbitbox.py
t@@ -134,7 +134,7 @@ class DigitalBitbox_Client():
"You cannot access your coins or a backup without the password.\r\n" \
"A backup is saved automatically when generating a new wallet.")
if self.password_dialog(msg):
- reply = self.hid_send_plain(b'{"password":"' + self.password + '"}')
+ reply = self.hid_send_plain(b'{"password":"' + self.password + b'"}')
else:
return False
t@@ -210,7 +210,7 @@ class DigitalBitbox_Client():
def dbb_generate_wallet(self):
key = self.stretch_key(self.password)
- filename = b"Electrum-" + time.strftime("%Y-%m-%d-%H-%M-%S") + ".pdf"
+ filename = ("Electrum-" + time.strftime("%Y-%m-%d-%H-%M-%S") + ".pdf").encode('utf8')
msg = b'{"seed":{"source": "create", "key": "%s", "filename": "%s", "entropy": "%s"}}' % (key, filename, b'Digital Bitbox Electrum Plugin')
reply = self.hid_send_encrypt(msg)
if 'error' in reply: