From 3e88e57d869d62a3a44e6b0b0494ccfd554bf97a Mon Sep 17 00:00:00 2001 From: maxmalysh Date: Wed, 7 Sep 2016 09:53:44 +0300 Subject: [PATCH 1/2] Added Python 3 support --- ethjsonrpc/client.py | 1 + ethjsonrpc/utils.py | 1 + requirements.txt | 1 + setup.py | 2 ++ 4 files changed, 5 insertions(+) diff --git a/ethjsonrpc/client.py b/ethjsonrpc/client.py index a4cb2e4..55ce93d 100644 --- a/ethjsonrpc/client.py +++ b/ethjsonrpc/client.py @@ -3,6 +3,7 @@ import requests from requests.exceptions import ConnectionError as RequestsConnectionError +from past.builtins import basestring from ethereum import utils from ethereum.abi import encode_abi, decode_abi diff --git a/ethjsonrpc/utils.py b/ethjsonrpc/utils.py index bc5919f..1e9fcfd 100644 --- a/ethjsonrpc/utils.py +++ b/ethjsonrpc/utils.py @@ -1,4 +1,5 @@ from ethjsonrpc.constants import BLOCK_TAGS +from past.builtins import basestring def hex_to_dec(x): diff --git a/requirements.txt b/requirements.txt index effd275..705cc96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ ethereum==1.0.8 requests==2.9.1 +future==0.15.2 diff --git a/setup.py b/setup.py index 4f5a57b..abfe4d6 100644 --- a/setup.py +++ b/setup.py @@ -20,9 +20,11 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 3', ], install_requires=[ 'ethereum==1.0.8', 'requests==2.9.1', + 'future==0.15.2', ], ) From 31bb533dca24de1fa2161de573a4d08f71e5c5fd Mon Sep 17 00:00:00 2001 From: maxmalysh Date: Wed, 7 Sep 2016 09:59:39 +0300 Subject: [PATCH 2/2] Updated dependencies --- requirements.txt | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 705cc96..952cca2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -ethereum==1.0.8 -requests==2.9.1 +ethereum==1.5.2 +requests==2.11.1 future==0.15.2 diff --git a/setup.py b/setup.py index abfe4d6..984b5ac 100644 --- a/setup.py +++ b/setup.py @@ -23,8 +23,8 @@ 'Programming Language :: Python :: 3', ], install_requires=[ - 'ethereum==1.0.8', - 'requests==2.9.1', + 'ethereum==1.5.2', + 'requests==2.11.1', 'future==0.15.2', ], )