[Issue 213] migrate to cytoolz library

setup.py

@@ -21,7 +21,7 @@
     "pysha3>=0.3",
     "requests>=2.12.4",
     "rlp>=0.4.7",
-    "toolz>=0.8.2",
+    "cytoolz>=0.8.2",
 ]
 
 if sys.platform == 'win32':

web3/contract.py

@@ -27,7 +27,7 @@
     DecodingError,
 )
 
-from toolz.functoolz import (
+from cytoolz.functoolz import (
     compose,
 )
 

web3/formatters.py

@@ -5,22 +5,23 @@
 import operator
 
 from eth_utils import (
+    add_0x_prefix,
     coerce_args_to_text,
     coerce_return_to_text,
+    compose as _compose,
+    decode_hex,
+    encode_hex,
+    is_0x_prefixed,
     is_address,
-    is_string,
-    is_integer,
-    is_null,
     is_dict,
-    is_0x_prefixed,
-    add_0x_prefix,
-    encode_hex,
-    decode_hex,
+    is_integer,
     is_list_like,
+    is_null,
+    is_string,
     to_normalized_address,
 )
 
-from toolz.functoolz import (
+from cytoolz.functoolz import (
     compose,
 )
 
@@ -71,9 +72,11 @@ def inner(value):
 
 
 def apply_to_array(formatter_fn):
-    return compose(
-        list,
+    # workaround for https://github.com/pytoolz/cytoolz/issues/103
+    # NOTE: must reverse arguments when migrating from _compose to cytoolz.compose
+    return _compose(
         functools.partial(map, formatter_fn),
+        list,
     )
 
 

web3/main.py

@@ -12,7 +12,7 @@
     coerce_return_to_text,
 )
 
-from toolz.functoolz import (
+from cytoolz.functoolz import (
     compose,
 )
 

web3/utils/functional.py

@@ -1,6 +1,6 @@
 import functools
 
-from toolz.functoolz import (
+from cytoolz.functoolz import (
     compose,
 )