wassname/catalyst
1
0
Fork 0
mirror of https://github.com/wassname/catalyst.git synced 2026-07-15 11:22:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Python 3 returns bytes, the parsing functions are looking for strings

Browse Source
This commit is contained in:
Matt Bornski
2018-02-26 15:44:32 -08:00
parent 25e9f0f58f
commit 497212383a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
catalyst/marketplace/marketplace.py
+9 -6
View File
@@ -40,6 +40,13 @@ else:
log = logbook.Logger('Marketplace', level=LOG_LEVEL)
def first_line_from_url(url):
request = urllib.urlopen(url)
first_line = request.readline()
if sys.version_info.major >= 3:
charset = request.info().get_content_charset()
first_line = first_line.decode(charset)
return first_line.strip()
class Marketplace:
def __init__(self):
@@ -57,10 +64,8 @@ class Marketplace:
self.web3 = Web3(HTTPProvider(ETH_REMOTE_NODE))
contract_url = urllib.urlopen(MARKETPLACE_CONTRACT)
self.mkt_contract_address = Web3.toChecksumAddress(
contract_url.readline().strip())
first_line_from_url(MARKETPLACE_CONTRACT))
abi_url = urllib.urlopen(MARKETPLACE_CONTRACT_ABI)
abi = json.load(abi_url)
@@ -70,10 +75,8 @@ class Marketplace:
abi=abi,
)
contract_url = urllib.urlopen(ENIGMA_CONTRACT)
self.eng_contract_address = Web3.toChecksumAddress(
contract_url.readline().strip())
first_line_from_url(ENIGMA_CONTRACT))
abi_url = urllib.urlopen(ENIGMA_CONTRACT_ABI)
abi = json.load(abi_url)