AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of github.com:spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2017-09-12 15:06:00 +02:00
parent 7f58e23ed9 95d94dcdd1
commit 6fda3733e4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/network.py
View File

@@ -982,10 +982,10 @@ class Network(util.DaemonThread):
filename = b.path() filename = b.path()
def download_thread(): def download_thread():
try: try:
import urllib, socket import urllib.request, socket
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
self.print_error("downloading ", bitcoin.HEADERS_URL) 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) os.rename(filename + '.tmp', filename)
self.print_error("done.") self.print_error("done.")
except Exception: except Exception:

2
lib/transaction.py
View File

@@ -591,6 +591,8 @@ class Transaction:
return addr return addr
elif output_type == TYPE_ADDRESS: elif output_type == TYPE_ADDRESS:
return bitcoin.address_to_script(addr) return bitcoin.address_to_script(addr)
elif output_type == TYPE_PUBKEY:
return addr
else: else:
raise TypeError('Unknown output type') raise TypeError('Unknown output type')
return script return script