URI: 
       tMerge pull request #1296 from romanz/master - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 99c50aa31f7be0f895fec8069199cf3aad898bcd
   DIR parent cf5d3e956bd2ecdd913ae93a56df06c28dc8a6aa
  HTML Author: ThomasV <electrumdev@gmail.com>
       Date:   Sat, 13 Jun 2015 16:38:52 +0200
       
       Merge pull request #1296 from romanz/master
       
       Fix few small issues.
       Diffstat:
         M lib/transaction.py                  |       1 +
         M lib/util.py                         |       5 ++++-
         M lib/verifier.py                     |       2 +-
       
       3 files changed, 6 insertions(+), 2 deletions(-)
       ---
   DIR diff --git a/lib/transaction.py b/lib/transaction.py
       t@@ -24,6 +24,7 @@ import bitcoin
        from bitcoin import *
        from util import print_error
        import time
       +import sys
        import struct
        
        #
   DIR diff --git a/lib/util.py b/lib/util.py
       t@@ -45,7 +45,10 @@ class DaemonThread(threading.Thread):
                    self.running = False
        
            def print_error(self, *msg):
       -        print_error("[%s]"%self.__class__.__name__, *msg)
       +        print_error("[%s]" % self.__class__.__name__, *msg)
       +
       +    def print_msg(self, *msg):
       +        print_msg("[%s]" % self.__class__.__name__, *msg)
        
        
        
   DIR diff --git a/lib/verifier.py b/lib/verifier.py
       t@@ -92,7 +92,7 @@ class SPV(util.DaemonThread):
        
        
            def undo_verifications(self, height):
       -        tx_hashes = selt.wallet.undo_verifications(height)
       +        tx_hashes = self.wallet.undo_verifications(height)
                for tx_hash in tx_hashes:
                    self.print_error("redoing", tx_hash)
                    self.merkle_roots.pop(tx_hash, None)