Run isort across all files

Author: dylanjw

conftest.py

@@ -2,13 +2,15 @@
 import time
 import warnings
 
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
 from web3._utils.threads import (
     Timeout,
 )
-from web3.main import Web3
+from web3.main import (
+    Web3,
+)
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 
 class PollDelayCounter:

tests/core/contracts/test_contract_call_interface.py

@@ -13,6 +13,12 @@
     HexBytes,
 )
 
+from web3._utils.ens import (
+    contract_ens_addresses,
+)
+from web3._utils.toolz import (
+    identity,
+)
 from web3.exceptions import (
     BadFunctionCallOutput,
     BlockNumberOutofRange,
@@ -21,12 +27,6 @@
     NoABIFunctionsFound,
     ValidationError,
 )
-from web3._utils.ens import (
-    contract_ens_addresses,
-)
-from web3._utils.toolz import (
-    identity,
-)
 
 # Ignore warning in pyethereum 1.6 - will go away with the upgrade
 pytestmark = pytest.mark.filterwarnings("ignore:implicit cast from 'char *'")

tests/core/contracts/test_contract_init.py

@@ -1,13 +1,13 @@
 import pytest
 
-from web3.exceptions import (
-    BadFunctionCallOutput,
-    NameNotFound,
-)
 from web3._utils.ens import (
     contract_ens_addresses,
     ens_addresses,
 )
+from web3.exceptions import (
+    BadFunctionCallOutput,
+    NameNotFound,
+)
 
 
 @pytest.fixture()

tests/core/contracts/test_contract_method_to_argument_matching.py

@@ -1,15 +1,15 @@
 import json
 import pytest
 
-from web3.exceptions import (
-    ValidationError,
-)
 from web3._utils.abi import (
     get_abi_input_types,
 )
 from web3._utils.function_identifiers import (
     FallbackFn,
 )
+from web3.exceptions import (
+    ValidationError,
+)
 
 SINGLE_FN_NO_ARGS = json.loads('[{"constant":false,"inputs":[],"name":"a","outputs":[],"type":"function"}]')  # noqa: E501
 SINGLE_FN_ONE_ARG = json.loads('[{"constant":false,"inputs":[{"name":"","type":"uint256"}],"name":"a","outputs":[],"type":"function"}]')  # noqa: E501

tests/core/eth-module/test_accounts.py

@@ -16,16 +16,16 @@
     Account,
     Web3,
 )
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
 from web3._utils.encoding import (
     to_bytes,
     to_hex,
 )
 from web3._utils.toolz import (
     dissoc,
 )
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 # from https://github.com/ethereum/tests/blob/3930ca3a9a377107d5792b3e7202f79c688f1a67/BasicTests/txtest.json # noqa: 501
 ETH_TEST_TRANSACTIONS = [

tests/core/filtering/test_existing_filter_instance.py

@@ -1,11 +1,11 @@
 import pytest
 
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
 from web3._utils.threads import (
     Timeout,
 )
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 
 @pytest.fixture()

tests/core/filtering/test_filter_against_latest_blocks.py

@@ -1,9 +1,9 @@
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
 from web3._utils.threads import (
     Timeout,
 )
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 
 def test_sync_filter_against_latest_blocks(web3, sleep_interval, wait_for_block):

tests/core/middleware/test_latest_block_based_cache_middleware.py

@@ -10,6 +10,9 @@
 )
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (  # noqa: F401
     construct_error_generator_middleware,
     construct_latest_block_based_cache_middleware,
@@ -18,9 +21,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3._utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

tests/core/middleware/test_simple_cache_middleware.py

@@ -3,6 +3,9 @@
 import uuid
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (
     construct_error_generator_middleware,
     construct_result_generator_middleware,
@@ -11,9 +14,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3._utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

tests/core/middleware/test_stalecheck.py

@@ -5,16 +5,16 @@
     patch,
 )
 
+from web3._utils.datastructures import (
+    AttributeDict,
+)
 from web3.middleware import (
     make_stalecheck_middleware,
 )
 from web3.middleware.stalecheck import (
     StaleBlockchain,
     _isfresh,
 )
-from web3._utils.datastructures import (
-    AttributeDict,
-)
 
 
 @pytest.fixture

tests/core/middleware/test_time_based_cache_middleware.py

@@ -4,6 +4,9 @@
 import uuid
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (  # noqa: F401
     construct_error_generator_middleware,
     construct_result_generator_middleware,
@@ -12,9 +15,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3._utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

tests/core/middleware/test_transaction_signing.py

@@ -11,6 +11,11 @@
 )
 
 from web3 import Web3
+from web3._utils.toolz import (
+    identity,
+    merge,
+    valfilter,
+)
 from web3.exceptions import (
     InvalidAddress,
 )
@@ -27,11 +32,6 @@
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
 )
-from web3._utils.toolz import (
-    identity,
-    merge,
-    valfilter,
-)
 
 PRIVATE_KEY_1 = to_bytes(
     hexstr='0x6a8b4de52b288e111c14e1c4b868bc125d325d40331d86d875a3467dd44bf829')

tests/core/utilities/test_encoding.py

@@ -16,9 +16,6 @@
     strategies as st,
 )
 
-from web3.providers import (
-    JSONBaseProvider,
-)
 from web3._utils.encoding import (
     FriendlyJsonSerde as FriendlyJson,
     hex_encode_abi_type,
@@ -30,6 +27,9 @@
 from web3._utils.hypothesis import (
     hexstr_strategy,
 )
+from web3.providers import (
+    JSONBaseProvider,
+)
 
 
 @pytest.mark.parametrize(

tests/core/utilities/test_math.py

@@ -5,12 +5,12 @@
     strategies as st,
 )
 
-from web3.exceptions import (
-    InsufficientData,
-)
 from web3._utils.math import (
     percentile,
 )
+from web3.exceptions import (
+    InsufficientData,
+)
 
 values = range(100)
 

tests/core/utilities/test_validation.py

@@ -4,15 +4,15 @@
     to_bytes,
 )
 
-from web3.exceptions import (
-    InvalidAddress,
-)
 from web3._utils.validation import (
     validate_abi,
     validate_abi_type,
     validate_abi_value,
     validate_address,
 )
+from web3.exceptions import (
+    InvalidAddress,
+)
 
 ABI = [
     {

tests/integration/test_ethereum_tester.py

@@ -10,9 +10,6 @@
 )
 
 from web3 import Web3
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
 from web3._utils.module_testing import (
     EthModuleTest,
     NetModuleTest,
@@ -23,6 +20,9 @@
 from web3._utils.module_testing.emitter_contract import (
     EMITTER_ENUM,
 )
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 pytestmark = pytest.mark.filterwarnings("ignore:implicit cast from 'char *'")
 

web3/_utils/abi.py

@@ -19,9 +19,6 @@
     to_tuple,
 )
 
-from web3.exceptions import (
-    FallbackNotFound,
-)
 from web3._utils.ens import (
     is_ens_name,
 )
@@ -33,6 +30,9 @@
     partial,
     pipe,
 )
+from web3.exceptions import (
+    FallbackNotFound,
+)
 
 
 def filter_by_type(_type, contract_abi):

web3/_utils/contracts.py

@@ -16,9 +16,6 @@
     HexBytes,
 )
 
-from web3.exceptions import (
-    ValidationError,
-)
 from web3._utils.abi import (
     abi_to_signature,
     check_if_arguments_can_be_encoded,
@@ -48,6 +45,9 @@
     pipe,
     valmap,
 )
+from web3.exceptions import (
+    ValidationError,
+)
 
 
 def find_matching_event_abi(abi, event_name=None, argument_names=None):

web3/_utils/events.py

@@ -15,9 +15,6 @@
     to_tuple,
 )
 
-from web3.exceptions import (
-    MismatchedABI,
-)
 from web3._utils.datastructures import (
     AttributeDict,
 )
@@ -32,6 +29,9 @@
     compose,
     curry,
 )
+from web3.exceptions import (
+    MismatchedABI,
+)
 
 from .abi import (
     exclude_indexed_event_inputs,

web3/_utils/module_testing/web3_module.py

@@ -5,12 +5,12 @@
 )
 
 from web3 import Web3
-from web3.exceptions import (
-    InvalidAddress,
-)
 from web3._utils.ens import (
     ens_addresses,
 )
+from web3.exceptions import (
+    InvalidAddress,
+)
 
 
 class Web3ModuleTest: