Merge remote-tracking branch 'upstream/master' into clean

2013-11-10 17:00:00 -05:00
parent 698f8bccef 24cabcbee9
commit d50d7efe18
21 changed files with 102 additions and 89 deletions
--- a/gui/gtk.py
+++ b/gui/gtk.py
@@ -807,7 +807,7 @@ class ElectrumWindow:

        try:
            tx = self.wallet.mktx( [(to_address, amount)], password, fee )
-        except BaseException, e:
+        except Exception as e:
            self.show_message(str(e))
            return