Fix types in commons

Author: bonjourmauko

openfisca_core/commons/misc.py

@@ -1,6 +1,6 @@
 from typing import TypeVar
 
-from openfisca_core.types import Array
+import numpy
 
 T = TypeVar("T")
 
@@ -43,7 +43,7 @@ def empty_clone(original: T) -> T:
     return new
 
 
-def stringify_array(array: Array) -> str:
+def stringify_array(array: numpy.ndarray) -> str:
     """Generates a clean string representation of a numpy array.
 
     Args:

openfisca_core/commons/rates.py

@@ -1,15 +1,13 @@
-from typing import Optional
+from typing import Optional, Sequence
 
 import numpy
 
-from openfisca_core.types import ArrayLike, Array
-
 
 def average_rate(
-        target: Array[float],
-        varying: ArrayLike[float],
-        trim: Optional[ArrayLike[float]] = None,
-        ) -> Array[float]:
+        target: numpy.ndarray,
+        varying: Sequence[float],
+        trim: Optional[Sequence[float]] = None,
+        ) -> numpy.ndarray:
     """Computes the average rate of a target net income.
 
     Given a ``target`` net income, and according to the ``varying`` gross
@@ -41,32 +39,31 @@ def average_rate(
 
     """
 
-    average_rate: Array[float]
-
-    average_rate = 1 - target / varying
+    rate: numpy.ndarray
+    rate = 1 - target / varying
 
     if trim is not None:
 
-        average_rate = numpy.where(
-            average_rate <= max(trim),
-            average_rate,
+        rate = numpy.where(
+            rate <= max(trim),
+            rate,
             numpy.nan,
             )
 
-        average_rate = numpy.where(
-            average_rate >= min(trim),
-            average_rate,
+        rate = numpy.where(
+            rate >= min(trim),
+            rate,
             numpy.nan,
             )
 
-    return average_rate
+    return rate
 
 
 def marginal_rate(
-        target: Array[float],
-        varying: Array[float],
-        trim: Optional[ArrayLike[float]] = None,
-        ) -> Array[float]:
+        target: numpy.ndarray,
+        varying: numpy.ndarray,
+        trim: Optional[numpy.ndarray] = None,
+        ) -> numpy.ndarray:
     """Computes the marginal rate of a target net income.
 
     Given a ``target`` net income, and according to the ``varying`` gross
@@ -98,26 +95,26 @@ def marginal_rate(
 
     """
 
-    marginal_rate: Array[float]
+    rate: numpy.ndarray
 
-    marginal_rate = (
+    rate = (
         + 1
         - (target[:-1] - target[1:])
         / (varying[:-1] - varying[1:])
         )
 
     if trim is not None:
 
-        marginal_rate = numpy.where(
-            marginal_rate <= max(trim),
-            marginal_rate,
+        rate = numpy.where(
+            rate <= max(trim),
+            rate,
             numpy.nan,
             )
 
-        marginal_rate = numpy.where(
-            marginal_rate >= min(trim),
-            marginal_rate,
+        rate = numpy.where(
+            rate >= min(trim),
+            rate,
             numpy.nan,
             )
 
-    return marginal_rate
+    return rate

openfisca_core/tracers/computation_log.py

@@ -27,7 +27,6 @@ def display(
             ) -> str:
         if isinstance(value, EnumArray):
             value = value.decode_to_str()
-            raise ValueError(type(value))
 
         return numpy.array2string(value, max_line_width = None)