Removed web3._utils.six support

ethereum · Oct 19, 2018 · 22a215f · 22a215f
1 parent aa86e01
commit 22a215f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/web3/_utils/caching.py b/web3/_utils/caching.py
@@ -1,3 +1,4 @@
+import collections
 import hashlib
 
 from eth_utils import (
@@ -11,10 +12,6 @@
     to_bytes,
 )
 
-from .six import (
-    Generator,
-)
-
 
 def generate_cache_key(value):
     """
@@ -32,7 +29,7 @@ def generate_cache_key(value):
             for key
             in sorted(value.keys())
         ))
-    elif is_list_like(value) or isinstance(value, Generator):
+    elif is_list_like(value) or isinstance(value, collections.Generator):
         return generate_cache_key("".join((
             generate_cache_key(item)
             for item

diff --git a/web3/_utils/six/__init__.py b/web3/_utils/six/__init__.py
diff --git a/web3/_utils/six/six.py b/web3/_utils/six/six.py
diff --git a/web3/utils/__init__.py b/web3/utils/__init__.py
@@ -20,7 +20,6 @@
     normalizers,
     request,
     rpc_abi,
-    six,
     threads,
     toolz,
     transactions,