From b70ef33e89d0198c7cc2c9935e373b013268c2e7 Mon Sep 17 00:00:00 2001 From: Dylan Wilson Date: Mon, 10 Sep 2018 20:15:19 -0700 Subject: [PATCH] Fix errors and flake 8 issue --- web3/_utils/events.py | 3 --- web3/providers/rpc.py | 3 --- web3/utils/__init__.py | 32 ++++++++++++++++++++++++++++---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/web3/_utils/events.py b/web3/_utils/events.py index 2657b4de32..f989369f58 100644 --- a/web3/_utils/events.py +++ b/web3/_utils/events.py @@ -32,9 +32,6 @@ compose, curry, ) -from web3.exceptions import ( - MismatchedABI, -) from .abi import ( exclude_indexed_event_inputs, diff --git a/web3/providers/rpc.py b/web3/providers/rpc.py index 466f74111a..89554e7262 100644 --- a/web3/providers/rpc.py +++ b/web3/providers/rpc.py @@ -17,9 +17,6 @@ from web3._utils.request import ( make_post_request, ) -from web3.middleware import ( - http_retry_request_middleware, -) from .base import ( JSONBaseProvider, diff --git a/web3/utils/__init__.py b/web3/utils/__init__.py index 02bdc1e5f2..bee0cbea8d 100644 --- a/web3/utils/__init__.py +++ b/web3/utils/__init__.py @@ -1,4 +1,28 @@ -from web3._utils import * -import web3._utils.compat as compat -import web3._utils.six as six -import web3._utils.toolz as toolz +from web3._utils import ( # noqa: F401 + abi, + blocks, + caching, + compat, + contracts, + datatypes, + decorators, + empty, + encoding, + ens, + events, + filters, + formatters, + function_identifiers, + http, + hypothesis, + math, + module_testing, + normalizers, + request, + rpc_abi, + six, + threads, + toolz, + transactions, + validation, +)