RanchiMall/pywallet-tools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No more crash when --web without twisted installed

Browse Source
This commit is contained in:
jackjack 2011-08-19 21:42:41 +02:00
parent 9b7f065251
commit 438b12e549
1 changed files with 166 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pywallet.py
View File

@ -1613,8 +1613,8 @@ def inverse_str(string):
ret += string[len(string)-2-2*i+1]; ret += string[len(string)-2-2*i+1];
return ret return ret
if 'twisted' not in missing_dep:
class WIInfo(resource.Resource): class WIInfo(resource.Resource):
def render_GET(self, request): def render_GET(self, request):
global addrtype global addrtype
@ -1667,7 +1667,7 @@ class WIInfo(resource.Resource):
ret += "Privkey (%s): %s<br />"%(aversions[addrtype], SecretToASecret(secret)) ret += "Privkey (%s): %s<br />"%(aversions[addrtype], SecretToASecret(secret))
ret += "Hexprivkey: %s<br />"%(secret.encode('hex')) ret += "Hexprivkey: %s<br />"%(secret.encode('hex'))
ret += "Hash160: %s<br />"%(bc_address_to_hash_160(addr).encode('hex')) ret += "Hash160: %s<br />"%(bc_address_to_hash_160(addr).encode('hex'))
# ret += "Inverted hexprivkey: %s<br />"%(inversetxid(secret.encode('hex'))) # ret += "Inverted hexprivkey: %s<br />"%(inversetxid(secret.encode('hex')))
ret += "Pubkey: <span style='font-size:60%%;'>04%.64x%.64x</span><br />"%(pkey.pubkey.point.x(), pkey.pubkey.point.y()) ret += "Pubkey: <span style='font-size:60%%;'>04%.64x%.64x</span><br />"%(pkey.pubkey.point.x(), pkey.pubkey.point.y())
ret += X_if_else('<br /><br /><b>Beware, 0x%s is equivalent to 0x%.33x</b>'%(secret.encode('hex'), int(secret.encode('hex'), 16)-_r), (int(secret.encode('hex'), 16)>_r), '') ret += X_if_else('<br /><br /><b>Beware, 0x%s is equivalent to 0x%.33x</b>'%(secret.encode('hex'), int(secret.encode('hex'), 16)-_r), (int(secret.encode('hex'), 16)>_r), '')
@ -1695,7 +1695,7 @@ class WIInfo(resource.Resource):
return self.render_GET(request) return self.render_GET(request)
class WIImportTx(resource.Resource): class WIImportTx(resource.Resource):
def render_GET(self, request): def render_GET(self, request):
global addrtype global addrtype
@ -1739,7 +1739,7 @@ class WIImportTx(resource.Resource):
def render_POST(self, request): def render_POST(self, request):
return self.render_GET(request) return self.render_GET(request)
class WIImport(resource.Resource): class WIImport(resource.Resource):
def render_GET(self, request): def render_GET(self, request):
global addrtype global addrtype
@ -1793,7 +1793,7 @@ class WIImport(resource.Resource):
def render_POST(self, request): def render_POST(self, request):
return self.render_GET(request) return self.render_GET(request)
class WI404(resource.Resource): class WI404(resource.Resource):
def render_GET(self, request): def render_GET(self, request):
return 'Page Not Found' return 'Page Not Found'
@ -1870,16 +1870,6 @@ if __name__ == '__main__':
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
VIEWS = {
'DumpWallet': WIDumpWallet(),
'Import': WIImport(),
'ImportTx': WIImportTx(),
'DumpTx': WIDumpTx(),
'Info': WIInfo(),
'Delete': WIDelete(),
'Balance': WIBalance()
}
# a=Popen("ps xa | grep ' bitcoin'", shell=True, bufsize=-1, stdout=PIPE).stdout # a=Popen("ps xa | grep ' bitcoin'", shell=True, bufsize=-1, stdout=PIPE).stdout
# aread=a.read() # aread=a.read()
# nl = aread.count("\n") # nl = aread.count("\n")
@ -1930,6 +1920,15 @@ if __name__ == '__main__':
if 'ecdsa' in missing_dep: if 'ecdsa' in missing_dep:
print("'ecdsa' package is not installed, pywallet won't be able to sign/verify messages") print("'ecdsa' package is not installed, pywallet won't be able to sign/verify messages")
VIEWS = {
'DumpWallet': WIDumpWallet(),
'Import': WIImport(),
'ImportTx': WIImportTx(),
'DumpTx': WIDumpTx(),
'Info': WIInfo(),
'Delete': WIDelete(),
'Balance': WIBalance()
}
if options.datadir is not None: if options.datadir is not None:
wallet_dir = options.datadir wallet_dir = options.datadir