From f990ecf14d58c79233eab7d122078b3182c480b4 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 2 Mar 2018 11:34:18 -0700 Subject: [PATCH] BUG: fix incompatibility with web3==4.0.0b11 --- catalyst/marketplace/marketplace.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index 37ed2ec6..b188d6d6 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -40,13 +40,6 @@ 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): @@ -65,7 +58,8 @@ class Marketplace: self.web3 = Web3(HTTPProvider(ETH_REMOTE_NODE)) self.mkt_contract_address = Web3.toChecksumAddress( - first_line_from_url(MARKETPLACE_CONTRACT)) + contract_url.readline().decode( + contract_url.info().get_content_charset()).strip()) abi_url = urllib.urlopen(MARKETPLACE_CONTRACT_ABI) abi = json.load(abi_url) @@ -76,7 +70,8 @@ class Marketplace: ) self.eng_contract_address = Web3.toChecksumAddress( - first_line_from_url(ENIGMA_CONTRACT)) + contract_url.readline().decode( + contract_url.info().get_content_charset()).strip()) abi_url = urllib.urlopen(ENIGMA_CONTRACT_ABI) abi = json.load(abi_url)