electrum

commit c844d22a19a026781baefde8abf458fb3fe3d01a
parent 85d9b8aa8dadac5e1d7f305b1258f9550c743b9f
Author: ThomasV <thomasv@gitorious>
Date:   Fri,  7 Aug 2015 12:22:47 +0200

synchronous_get: return -> raise exception

Diffstat:
M
gui/qt/main_window.py
 | 
14
+++++++-------
M
lib/network_proxy.py
 | 
2
+-

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -2272,13 +2272,13 @@ class ElectrumWindow(QMainWindow):
         from electrum import transaction
         txid, ok = QInputDialog.getText(self, _('Lookup transaction'), _('Transaction ID') + ':')
         if ok and txid:
-            r = self.network.synchronous_get([ ('blockchain.transaction.get',[str(txid)]) ])[0]
-            if r:
-                tx = transaction.Transaction(r)
-                if tx:
-                    self.show_transaction(tx)
-                else:
-                    self.show_message("unknown transaction")
+            try:
+                r = self.network.synchronous_get([('blockchain.transaction.get',[str(txid)])])[0]
+            except BaseException as e:
+                self.show_message(str(e))
+                return
+            tx = transaction.Transaction(r)
+            self.show_transaction(tx)
 
 
     @protected
diff --git a/lib/network_proxy.py b/lib/network_proxy.py
@@ -170,7 +170,7 @@ class NetworkProxy(util.DaemonThread):
             _id = r.get('id')
             ids.remove(_id)
             if r.get('error'):
-                return BaseException(r.get('error'))
+                raise BaseException(r.get('error'))
             result = r.get('result')
             res[_id] = r.get('result')
         out = []