catch all errors while decoding script
authorForrest Voight <forrest@forre.st>
Mon, 8 Aug 2011 17:44:38 +0000 (13:44 -0400)
committerForrest Voight <forrest@forre.st>
Mon, 8 Aug 2011 17:44:38 +0000 (13:44 -0400)
p2pool/bitcoin/data.py

index e700e5e..b6886b4 100644 (file)
@@ -445,7 +445,7 @@ def script2_to_human(script2, net):
     try:
         pubkey = script2[1:-1]
         script2_test = pubkey_to_script2(pubkey)
-    except EarlyEnd, LateEnd:
+    except:
         pass
     else:
         if script2_test == script2:
@@ -454,7 +454,7 @@ def script2_to_human(script2, net):
     try:
         pubkey_hash = ShortHashType().unpack(script2[3:-2])
         script2_test2 = pubkey_hash_to_script2(pubkey_hash)
-    except EarlyEnd, LateEnd:
+    except:
         pass
     else:
         if script2_test2 == script2: