git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
af383ed
)
catch all errors while decoding script
author
Forrest Voight
<forrest@forre.st>
Mon, 8 Aug 2011 17:44:38 +0000 (13:44 -0400)
committer
Forrest Voight
<forrest@forre.st>
Mon, 8 Aug 2011 17:44:38 +0000 (13:44 -0400)
p2pool/bitcoin/data.py
patch
|
blob
|
history
diff --git
a/p2pool/bitcoin/data.py
b/p2pool/bitcoin/data.py
index
e700e5e
..
b6886b4
100644
(file)
--- a/
p2pool/bitcoin/data.py
+++ b/
p2pool/bitcoin/data.py
@@
-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: