tget_tx_info: fix types - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9896718f098174d6fcc9f81198511e7a77c61529
DIR parent 60756e2ef992e9d0efb87327b166b97516aacc4a
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 9 Jun 2016 18:09:45 +0200
get_tx_info: fix types
Diffstat:
M gui/kivy/uix/dialogs/tx_dialog.py | 3 ++-
M gui/qt/transaction_dialog.py | 2 +-
M lib/wallet.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py
t@@ -107,7 +107,8 @@ class TxDialog(Factory.Popup):
def update(self):
format_amount = self.app.format_amount_and_units
- self.tx_hash, self.status_str, self.description, self.can_broadcast, self.can_rbf, amount, fee, height, conf, timestamp, exp_n = self.wallet.get_tx_info(self.tx)
+ tx_hash, self.status_str, self.description, self.can_broadcast, self.can_rbf, amount, fee, height, conf, timestamp, exp_n = self.wallet.get_tx_info(self.tx)
+ self.tx_hash = tx_hash or ''
if timestamp:
self.date_str = datetime.fromtimestamp(timestamp).isoformat(' ')[:-3]
elif exp_n:
DIR diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py
t@@ -190,7 +190,7 @@ class TxDialog(QDialog, MessageBoxMixin):
else:
self.sign_button.hide()
- self.tx_hash_e.setText(tx_hash)
+ self.tx_hash_e.setText(tx_hash or _('Unknown'))
if desc is None:
self.tx_desc.hide()
else:
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -606,7 +606,7 @@ class Abstract_Wallet(PrintError):
exp_n = None
can_broadcast = False
can_bump = False
- label = None
+ label = ''
height = conf = timestamp = None
if tx.is_complete():
tx_hash = tx.hash()
t@@ -633,7 +633,7 @@ class Abstract_Wallet(PrintError):
else:
s, r = tx.signature_count()
status = _("Unsigned") if s == 0 else _('Partially signed') + ' (%d/%d)'%(s,r)
- tx_hash = _('Unknown')
+ tx_hash = None
if is_relevant:
if is_mine: