Merge branch 'master' of github.com:spesmilo/electrum
This commit is contained in:
commit
6fda3733e4
|
@ -982,10 +982,10 @@ class Network(util.DaemonThread):
|
|||
filename = b.path()
|
||||
def download_thread():
|
||||
try:
|
||||
import urllib, socket
|
||||
import urllib.request, socket
|
||||
socket.setdefaulttimeout(30)
|
||||
self.print_error("downloading ", bitcoin.HEADERS_URL)
|
||||
urllib.urlretrieve(bitcoin.HEADERS_URL, filename + '.tmp')
|
||||
urllib.request.urlretrieve(bitcoin.HEADERS_URL, filename + '.tmp')
|
||||
os.rename(filename + '.tmp', filename)
|
||||
self.print_error("done.")
|
||||
except Exception:
|
||||
|
|
|
@ -591,6 +591,8 @@ class Transaction:
|
|||
return addr
|
||||
elif output_type == TYPE_ADDRESS:
|
||||
return bitcoin.address_to_script(addr)
|
||||
elif output_type == TYPE_PUBKEY:
|
||||
return addr
|
||||
else:
|
||||
raise TypeError('Unknown output type')
|
||||
return script
|
||||
|
|
Loading…
Reference in New Issue