tminor fixes - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 508b5373ac009f9d7cde29a8c2c493ab0524dd1f
DIR parent 8960b16e09f8631a41341ced2b02896aa03cb994
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 22 Jul 2015 15:33:50 +0200
minor fixes
Diffstat:
M gui/qt/main_window.py | 2 +-
M lib/paymentrequest.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -685,7 +685,7 @@ class ElectrumWindow(QMainWindow):
return
addr = str(item.text(2))
req = self.wallet.receive_requests[addr]
- expires = _('Never') if req.get('exp') is None else util.age(req['time'] + req['exp'])
+ expires = util.age(req['time'] + req['exp']) if req.get('exp') else _('Never')
amount = req['amount']
message = self.wallet.labels.get(addr, '')
self.receive_address_e.setText(addr)
DIR diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
t@@ -291,7 +291,7 @@ def make_unsigned_request(req):
from transaction import Transaction
addr = req['address']
time = req.get('time', 0)
- expires = req.get('exp', 0)
+ exp = req.get('exp', 0)
if time and type(time) != int:
time = 0
if exp and type(exp) != int:
t@@ -306,7 +306,7 @@ def make_unsigned_request(req):
for script, amount in outputs:
pd.outputs.add(amount=amount, script=script)
pd.time = time
- pd.expires = time + expires if expires else 0
+ pd.expires = time + exp if exp else 0
pd.memo = memo
pr = pb2.PaymentRequest()
pr.serialized_payment_details = pd.SerializeToString()