Implementing a better print_error routine

lib/gui.py

@@ -23,6 +23,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk, gobject
 from decimal import Decimal
+from lib.util import print_error
 
 import pyqrnative, mnemonic
 
@@ -206,8 +207,7 @@ def run_recovery_dialog(wallet):
     try:
         seed.decode('hex')
     except:
-        sys.stderr.write("Warning: Not hex, trying decode\n")
-        sys.stderr.flush()
+        print_error("Warning: Not hex, trying decode")
         seed = mnemonic.mn_decode( seed.split(' ') )
     if not seed:
         show_message("no seed")

lib/gui_qt.py

@@ -18,13 +18,13 @@
 
 import sys, time, datetime, re
 from i18n import _
+from lib.util import print_error
 
 try:
     import PyQt4
 except:
-    sys.stderr.write("Error: Could not import PyQt4\n")
-    sys.stderr.write("on Linux systems, you may try 'sudo apt-get install python-qt4'\n")
-    sys.stderr.flush()
+    print_error("Error: Could not import PyQt4")
+    print_error("on Linux systems, you may try 'sudo apt-get install python-qt4'")
     sys.exit(1)
 
 from PyQt4.QtGui import *
@@ -36,9 +36,8 @@ from interface import DEFAULT_SERVERS
 try:
     import icons_rc
 except:
-    sys.stderr.write("Error: Could not import icons_rc.py\n")
-    sys.stderr.write("Please generate it with: 'pyrcc4 icons.qrc -o lib/icons_rc.py'\n")
-    sys.stderr.flush()
+    print_error("Error: Could not import icons_rc.py")
+    print_error("Please generate it with: 'pyrcc4 icons.qrc -o lib/icons_rc.py'")
     sys.exit(1)
 
 from wallet import format_satoshis
@@ -390,8 +389,7 @@ class ElectrumWindow(QMainWindow):
             if text not in self.wallet.aliases.keys():
                 self.wallet.labels[addr] = text
             else:
-                sys.stderr.write("Error: This is one of your aliases\n")
-                sys.stderr.flush()
+                print_error("Error: This is one of your aliases")
                 label = self.wallet.labels.get(addr,'')
                 item.setText(column_label, QString(label))
         else:
@@ -1144,8 +1142,7 @@ class ElectrumWindow(QMainWindow):
             seed = unicode(seed_e.text())
             seed.decode('hex')
         except:
-            sys.stderr.write("Warning: Not hex, trying decode\n")
-            sys.stderr.flush()
+            print_error("Warning: Not hex, trying decode")
             try:
                 seed = mnemonic.mn_decode( seed.split(' ') )
             except:

lib/interface.py

@@ -21,6 +21,7 @@ import random, socket, ast, re
 import threading, traceback, sys, time, json, Queue
 
 from version import ELECTRUM_VERSION
+from lib.util import print_error
 
 DEFAULT_TIMEOUT = 5
 DEFAULT_SERVERS = [ 'ecdsa.org:50001:t', 
@@ -247,8 +248,7 @@ class TcpStratumInterface(Interface):
             print "Connected to %s:%d"%(self.host,self.port)
         except:
             self.is_connected = False
-            sys.stderr.write("Not connected\n")
-            sys.stderr.flush()
+            print_error("Not connected")
 
     def run(self):
         try:
@@ -328,8 +328,7 @@ class WalletSynchronizer(threading.Thread):
         elif protocol == 'h':
             InterfaceClass = HttpStratumInterface
         else:
-            sys.stderr.write("Error: Unknown protocol\n")
-            sys.stderr.flush()
+            print_error("Error: Unknown protocol")
             InterfaceClass = TcpStratumInterface
 
         self.interface = InterfaceClass(host, port, self.wallet.debug_server)
@@ -386,8 +385,7 @@ class WalletSynchronizer(threading.Thread):
             pass
 
         else:
-            sys.stderr.write("Error: Unknown message:" + method + ", " + params + ", " + result)
-            sys.stderr.flush()
+            print_error("Error: Unknown message:" + method + ", " + params + ", " + result)
 
 
     def start_interface(self):

lib/util.py

@@ -2,6 +2,13 @@ import os
 import platform
 import sys
 
+def print_error(*args):
+    for item in args:
+      sys.stderr.write(str(item))
+
+    sys.stderr.write("\n")
+    sys.stderr.flush()
+
 def appdata_dir():
     if platform.system() == "Windows":
         return os.path.join(os.environ["APPDATA"], "Electrum")

lib/wallet.py

@@ -20,6 +20,7 @@
 import sys, base64, os, re, hashlib, copy, operator, ast, threading, random, getpass
 import aes, ecdsa
 from ecdsa.util import string_to_number, number_to_string
+from lib.util import print_error
 
 ############ functions from pywallet ##################### 
 
@@ -156,8 +157,7 @@ def prompt_password(prompt, confirm=True):
             password2 = getpass.getpass("Confirm: ")
 
             if password != password2:
-                sys.stderr.write("Error: Passwords do not match.\n")
-                sys.stderr.flush()
+                print_error("Error: Passwords do not match.")
                 sys.exit(1)
 
     else: