electrum

commit c57ed0c212ce6d9004503b85587515f13239c235
parent aee11fc945b22af6f3d052d59ef1801793d146a3
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 12 Feb 2016 22:42:22 +0100

kivy: simplify parse_URI

Diffstat:
M
gui/kivy/main_window.py
 | 
2
+-
M
gui/kivy/uix/screens.py
 | 
7
+------

2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
@@ -232,7 +232,7 @@ class ElectrumWindow(App):
         try:
             url = electrum.util.parse_URI(url, self.on_pr)
         except:
-            self.show_info("Invalid URI", url)
+            self.show_info(_("Not a Bitcoin URI") + ':\n', url)
             return
         self.send_screen.set_URI(url)
 
diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
@@ -230,12 +230,7 @@ class SendScreen(CScreen):
         if not contents:
             self.app.show_info(_("Clipboard is empty"))
             return
-        try:
-            uri = parse_URI(contents)
-        except:
-            self.app.show_info(_("Clipboard content is not a Bitcoin URI"))
-            return
-        self.set_URI(uri)
+        self.app.set_URI(contents)
 
     def do_send(self):
         if self.payment_request: