Merge pull request #1332 from romanz/master

fix small typos at lib/interface.py and lib/commands.py
This commit is contained in:
ThomasV 2015-07-02 08:37:42 +02:00
commit 516e469d3c
2 changed files with 2 additions and 4 deletions

View File

@ -199,8 +199,8 @@ class Commands:
t = Transaction(tx) t = Transaction(tx)
t.deserialize() t.deserialize()
if privkey: if privkey:
pubkey = bitcoin.public_key_from_private_key(sec) pubkey = bitcoin.public_key_from_private_key(privkey)
t.sign({pubkey:sec}) t.sign({pubkey:privkey})
else: else:
self.wallet.sign_transaction(t, self.password) self.wallet.sign_transaction(t, self.password)
return t return t

View File

@ -228,7 +228,6 @@ class TcpInterface(threading.Thread):
try: try:
x = x509.X509() x = x509.X509()
x.parse(cert) x.parse(cert)
x.slow_parse()
except: except:
traceback.print_exc(file=sys.stderr) traceback.print_exc(file=sys.stderr)
self.print_error("wrong certificate") self.print_error("wrong certificate")
@ -342,7 +341,6 @@ def check_cert(host, cert):
try: try:
x = x509.X509() x = x509.X509()
x.parse(cert) x.parse(cert)
x.slow_parse()
except: except:
traceback.print_exc(file=sys.stdout) traceback.print_exc(file=sys.stdout)
return return