Merge pull request #1033 from dylanjw/_utils

Move web3.utils to web3._utils

Author: dylanjw

conftest.py

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

tests/conftest.py

@@ -4,7 +4,7 @@
     to_bytes,
 )
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     identity,
 )
 

tests/core/caching-utils/test_generate_cache_key.py

@@ -8,7 +8,7 @@
     strategies as st,
 )
 
-from web3.utils.caching import (
+from web3._utils.caching import (
     generate_cache_key,
 )
 

tests/core/contracts/test_args_and_kwargs_merger.py

@@ -1,6 +1,6 @@
 import pytest
 
-from web3.utils.abi import (
+from web3._utils.abi import (
     merge_args_and_kwargs,
 )
 

tests/core/contracts/test_contract_ambiguous_functions.py

@@ -4,7 +4,7 @@
     HexBytes,
 )
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     compose,
     curry,
 )

tests/core/contracts/test_contract_buildTransaction.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     dissoc,
 )
 

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._utils.ens import (
+    contract_ens_addresses,
+    ens_addresses,
+)
 from web3.exceptions import (
     BadFunctionCallOutput,
     NameNotFound,
 )
-from web3.utils.ens import (
-    contract_ens_addresses,
-    ens_addresses,
-)
 
 
 @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 (
+from web3._utils.abi import (
     get_abi_input_types,
 )
-from web3.utils.function_identifiers import (
+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/contracts/test_contract_transact_interface.py

@@ -6,7 +6,7 @@
     to_bytes,
 )
 
-from web3.utils.empty import (
+from web3._utils.empty import (
     empty,
 )