Use formatting methods from eth-utils

newsfragments/1479.misc.rst

@@ -0,0 +1 @@
+Use formatting functions from eth-utils instead of web3

tests/core/utilities/test_formatters.py

@@ -1,8 +1,11 @@
 
 import pytest
 
-from web3._utils.formatters import (
+from eth_utils.curried import (
     apply_formatters_to_dict,
+)
+
+from web3._utils.formatters import (
     map_collection,
     recursive_map,
 )

web3/_utils/datatypes.py

@@ -1,9 +1,10 @@
+from eth_utils import (
+    apply_formatters_to_dict,
+)
 from eth_utils.toolz import (
     concat,
 )
 
-import web3._utils.formatters
-
 
 def verify_attr(class_name, key, namespace):
     if key not in namespace:
@@ -28,7 +29,7 @@ def __new__(mcs, name, bases, namespace, normalizers=None):
             verify_attr(name, key, all_keys)
 
         if normalizers:
-            processed_namespace = web3._utils.formatters.apply_formatters_to_dict(
+            processed_namespace = apply_formatters_to_dict(
                 normalizers,
                 namespace,
             )

web3/_utils/events.py

@@ -20,6 +20,9 @@
     to_hex,
     to_tuple,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 from eth_utils.toolz import (
     complement,
     compose,
@@ -34,9 +37,6 @@
     hexstr_if_str,
     to_bytes,
 )
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
 from web3._utils.normalizers import (
     BASE_RETURN_NORMALIZERS,
 )

web3/_utils/filters.py

@@ -6,6 +6,9 @@
     is_string,
     is_text,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 from eth_utils.toolz import (
     complement,
     curry,
@@ -14,9 +17,6 @@
     HexBytes,
 )
 
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
 from web3._utils.threads import (
     TimerClass,
 )

web3/_utils/formatters.py

@@ -10,6 +10,9 @@
     to_dict,
     to_list,
 )
+from eth_utils.curried import (
+    apply_formatter_at_index,
+)
 from eth_utils.toolz import (
     compose,
     curry,
@@ -28,21 +31,6 @@ def hex_to_integer(value):
 integer_to_hex = hex
 
 
-@curry
-@to_list
-def apply_formatter_at_index(formatter, at_index, value):
-    if at_index + 1 > len(value):
-        raise IndexError(
-            "Not enough values in iterable to apply formatter.  Got: {0}. "
-            "Need: {1}".format(len(value), at_index + 1)
-        )
-    for index, item in enumerate(value):
-        if index == at_index:
-            yield formatter(item)
-        else:
-            yield item
-
-
 def apply_formatters_to_args(*formatters):
     return compose(*(
         apply_formatter_at_index(formatter, index)
@@ -51,43 +39,13 @@ def apply_formatters_to_args(*formatters):
     ))
 
 
-@curry
-def apply_formatter_if(condition, formatter, value):
-    if condition(value):
-        return formatter(value)
-    else:
-        return value
-
-
-@curry
-@to_dict
-def apply_formatters_to_dict(formatters, value):
-    for key, item in value.items():
-        if key in formatters:
-            try:
-                yield key, formatters[key](item)
-            except (TypeError, ValueError) as exc:
-                raise type(exc)("Could not format value %r as field %r" % (item, key)) from exc
-        else:
-            yield key, item
-
-
 @curry
 @to_list
 def apply_formatter_to_array(formatter, value):
     for item in value:
         yield formatter(item)
 
 
-@curry
-def apply_one_of_formatters(formatter_condition_pairs, value):
-    for formatter, condition in formatter_condition_pairs:
-        if condition(value):
-            return formatter(value)
-    else:
-        raise ValueError("The provided value did not satisfy any of the formatter conditions")
-
-
 def map_collection(func, collection):
     """
     Apply func to each element of a collection, or value of a dictionary.

web3/_utils/rpc_abi.py

@@ -1,16 +1,16 @@
 from eth_utils import (
     to_dict,
 )
+from eth_utils.curried import (
+    apply_formatter_at_index,
+)
 from eth_utils.toolz import (
     curry,
 )
 
 from web3._utils.abi import (
     map_abi_data,
 )
-from web3._utils.formatters import (
-    apply_formatter_at_index,
-)
 
 TRANSACTION_PARAMS_ABIS = {
     'data': 'bytes',

web3/_utils/validation.py

@@ -13,6 +13,9 @@
     is_list_like,
     is_string,
 )
+from eth_utils.curried import (
+    apply_formatter_to_array,
+)
 from eth_utils.hexadecimal import (
     encode_hex,
 )
@@ -37,9 +40,6 @@
     length_of_array_type,
     sub_type_of_array_type,
 )
-from web3._utils.formatters import (
-    apply_formatter_to_array,
-)
 from web3.exceptions import (
     InvalidAddress,
 )

web3/middleware/signing.py

@@ -15,13 +15,13 @@
 from eth_utils import (
     to_dict,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 from eth_utils.toolz import (
     compose,
 )
 
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
 from web3._utils.method_formatters import (
     STANDARD_NORMALIZERS,
 )

web3/providers/eth_tester/defaults.py

@@ -14,16 +14,15 @@
     is_null,
     keccak,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+)
 from eth_utils.toolz import (
     compose,
     curry,
     excepts,
 )
 
-from web3._utils.formatters import (
-    apply_formatter_if,
-)
-
 
 def not_implemented(*args, **kwargs):
     raise NotImplementedError("RPC method not implemented")

web3/providers/eth_tester/middleware.py

@@ -5,6 +5,10 @@
     is_hex,
     is_string,
 )
+from eth_utils.curried import (
+    apply_formatter_if,
+    apply_formatters_to_dict,
+)
 from eth_utils.toolz import (
     assoc,
     complement,
@@ -16,10 +20,8 @@
 )
 
 from web3._utils.formatters import (
-    apply_formatter_if,
     apply_formatter_to_array,
     apply_formatters_to_args,
-    apply_formatters_to_dict,
     apply_key_map,
     hex_to_integer,
     integer_to_hex,