Merge pull request #1038 from Exef/exef/export-datastructures

Move all used datastructures from utils module

docs/examples.rst

@@ -343,7 +343,7 @@ Fetch various data about the current state of the ERC20 contract.
     >>> erc20.functions.decimals().call()
     0
     >>> erc20.functions.totalSupply().call()
-    2038
+    2039
 
 Get the balance of an account address. 
 

tests/core/middleware/test_stalecheck.py

@@ -5,16 +5,16 @@
     patch,
 )
 
+from web3.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/utilities/test_attributedict.py

@@ -1,6 +1,6 @@
 import pytest
 
-from web3.utils.datastructures import (
+from web3.datastructures import (
     AttributeDict,
 )
 

web3/utils/datastructures.py → web3/datastructures.py

@@ -1,4 +1,3 @@
-
 from collections import (
     Hashable,
     Mapping,

web3/manager.py

@@ -5,6 +5,9 @@
     is_list_like,
 )
 
+from web3.datastructures import (
+    NamedElementOnion,
+)
 from web3.exceptions import (
     CannotHandleRequest,
     UnhandledRequest,
@@ -22,9 +25,6 @@
 from web3.providers import (
     AutoProvider,
 )
-from web3.utils.datastructures import (
-    NamedElementOnion,
-)
 from web3.utils.empty import (
     empty,
 )

web3/middleware/attrdict.py

@@ -2,7 +2,7 @@
     is_dict,
 )
 
-from web3.utils.datastructures import (
+from web3.datastructures import (
     AttributeDict,
 )
 from web3.utils.toolz import (

web3/providers/rpc.py

@@ -5,12 +5,12 @@
     to_dict,
 )
 
+from web3.datastructures import (
+    NamedElementOnion,
+)
 from web3.middleware import (
     http_retry_request_middleware,
 )
-from web3.utils.datastructures import (
-    NamedElementOnion,
-)
 from web3.utils.http import (
     construct_user_agent,
 )

web3/utils/events.py

@@ -15,12 +15,12 @@
     to_tuple,
 )
 
+from web3.datastructures import (
+    AttributeDict,
+)
 from web3.exceptions import (
     MismatchedABI,
 )
-from web3.utils.datastructures import (
-    AttributeDict,
-)
 from web3.utils.encoding import (
     hexstr_if_str,
     to_bytes,