From 42f9d1ee6375d467fc40ee845dc6bc1a4cc6d7fd Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 22 Oct 2017 07:33:03 +0200 Subject: [PATCH] kivy: py3 updates --- gui/kivy/uix/dialogs/installwizard.py | 2 +- gui/kivy/uix/dialogs/tx_dialog.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/kivy/uix/dialogs/installwizard.py b/gui/kivy/uix/dialogs/installwizard.py index 886b4ce38..aea257ccd 100644 --- a/gui/kivy/uix/dialogs/installwizard.py +++ b/gui/kivy/uix/dialogs/installwizard.py @@ -690,7 +690,7 @@ class ShowXpubDialog(WizardDialog): self.app.do_share(self.xpub, _("Master Public Key")) def do_qr(self): - from qr_dialog import QRDialog + from .qr_dialog import QRDialog popup = QRDialog(_("Master Public Key"), self.xpub, True) popup.open() diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py index 00564cfcb..d5b876993 100644 --- a/gui/kivy/uix/dialogs/tx_dialog.py +++ b/gui/kivy/uix/dialogs/tx_dialog.py @@ -129,7 +129,7 @@ class TxDialog(Factory.Popup): self.ids.output_list.update(self.tx.outputs()) def do_rbf(self): - from bump_fee_dialog import BumpFeeDialog + from .bump_fee_dialog import BumpFeeDialog is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(self.tx) size = self.tx.estimated_size() d = BumpFeeDialog(self.app, fee, size, self._do_rbf) @@ -171,7 +171,7 @@ class TxDialog(Factory.Popup): self.app.broadcast(self.tx) def show_qr(self): - from electrum.bitcoin import base_encode - text = str(self.tx).decode('hex') + from electrum.bitcoin import base_encode, bfh + text = bfh(str(self.tx)) text = base_encode(text, base=43) self.app.qr_dialog(_("Raw Transaction"), text)