From b3e689c09187e44cdfd28da726a5d9fd19473399 Mon Sep 17 00:00:00 2001 From: Julius Remigio <14811322+juls858@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:23:30 -0700 Subject: [PATCH] - fixed relative imports --- web3/eth.py | 2 +- web3/eth_abi/abi.py | 6 +++--- web3/eth_utils/crypto.py | 2 +- web3/iban.py | 2 +- web3/shh.py | 2 +- web3/utils/compat/compat_requests.py | 1 - web3/utils/exception.py | 4 ++-- web3/utils/exception_py3.py | 4 ++-- web3/version.py | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/web3/eth.py b/web3/eth.py index 54c7acc..de84947 100755 --- a/web3/eth.py +++ b/web3/eth.py @@ -6,7 +6,7 @@ from eth_utils import ( coerce_return_to_text, ) -import formatters +from web3 import formatters from .iban import Iban from .contract import ( diff --git a/web3/eth_abi/abi.py b/web3/eth_abi/abi.py index f8f1542..3a321ab 100755 --- a/web3/eth_abi/abi.py +++ b/web3/eth_abi/abi.py @@ -12,16 +12,16 @@ from ..eth_utils import ( decode_hex, ) -from decoding import ( +from ..eth_abi.decoding import ( get_single_decoder, get_multi_decoder, ) -from encoding import ( +from ..eth_abi.encoding import ( get_single_encoder, get_multi_encoder, ) -from utils.parsing import ( +from ..eth_abi.utils.parsing import ( process_type, ) diff --git a/web3/eth_utils/crypto.py b/web3/eth_utils/crypto.py index 70d1106..5ccc32a 100755 --- a/web3/eth_utils/crypto.py +++ b/web3/eth_utils/crypto.py @@ -14,7 +14,7 @@ from .string import ( def keccak(value): # print keccak_256(force_bytes(value)) - print "%s: %s " % (value, keccak_256(force_bytes(value))) + # print "%s: %s " % (value, keccak_256(force_bytes(value))) return keccak_256(force_bytes(value)) diff --git a/web3/iban.py b/web3/iban.py index ab51063..f9e1a93 100755 --- a/web3/iban.py +++ b/web3/iban.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import re import functools -from eth_utils import ( +from .eth_utils import ( is_string, coerce_args_to_text, pad_left, diff --git a/web3/shh.py b/web3/shh.py index b9e286f..676c452 100755 --- a/web3/shh.py +++ b/web3/shh.py @@ -1,4 +1,4 @@ -from ..web3 import formatters +from web3 import formatters from .utils.encoding import ( to_decimal, ) diff --git a/web3/utils/compat/compat_requests.py b/web3/utils/compat/compat_requests.py index 73d4708..8641de4 100755 --- a/web3/utils/compat/compat_requests.py +++ b/web3/utils/compat/compat_requests.py @@ -1,5 +1,4 @@ #import requests -from google.appengine.api import urlfetch, urlfetch_stub from ...pylru import pylru diff --git a/web3/utils/exception.py b/web3/utils/exception.py index b22f30f..5c471a4 100755 --- a/web3/utils/exception.py +++ b/web3/utils/exception.py @@ -3,6 +3,6 @@ import sys # raise MyException() from original_exception compatibility if sys.version_info.major == 2: - from .exception_py2 import raise_from # noqa: F401 + from web3.utils.exception_py2 import raise_from # noqa: F401 else: - from .exception_py3 import raise_from # noqa: F401 + from web3.utils.exception_py3 import raise_from # noqa: F401 diff --git a/web3/utils/exception_py3.py b/web3/utils/exception_py3.py index 040c6bb..cedbed3 100755 --- a/web3/utils/exception_py3.py +++ b/web3/utils/exception_py3.py @@ -1,2 +1,2 @@ -# def raise_from(my_exception, other_exception): -# raise my_exception from other_exception +def raise_from(my_exception, other_exception): + raise my_exception from other_exception diff --git a/web3/version.py b/web3/version.py index 39cbaf2..0d1ac0e 100755 --- a/web3/version.py +++ b/web3/version.py @@ -14,7 +14,7 @@ class Version(object): @property def api(self): - from ..web3 import __version__ + from web3 import __version__ return __version__ @property