Rename encodable protocol

openfisca_core/indexed_enums/enum.py

@@ -5,14 +5,14 @@
 
 import numpy
 
-from openfisca_core.types import ArrayType, Encodable
+from openfisca_core.types import ArrayType, SupportsEncode
 
 from .. import indexed_enums as enums
 from .enum_array import EnumArray
 
 A = Union[
     EnumArray,
-    ArrayType[Encodable],
+    ArrayType[SupportsEncode],
     ArrayType[bytes],
     ArrayType[int],
     ArrayType[str],
@@ -133,6 +133,18 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return f"{self.__class__.__name__}.{self.name}"
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Enum):
+            return NotImplemented
+
+        return self.index == other.index
+
+    def __ne__(self, other: object) -> bool:
+        if not isinstance(other, Enum):
+            return NotImplemented
+
+        return self.index != other.index
+
     def __lt__(self, other: object) -> bool:
         if not isinstance(other, Enum):
             return NotImplemented
@@ -157,9 +169,6 @@ def __ge__(self, other: object) -> bool:
 
         return self.index >= other.index
 
-    __eq__ = object.__eq__
-    """Bypass the slow :meth:`~enum.Enum.__eq__`."""
-
     __hash__ = object.__hash__
     """:meth:`.__hash__` must also be defined as so to stay hashable."""
 

openfisca_core/indexed_enums/enum_array.py

@@ -4,7 +4,7 @@
 
 import numpy
 
-from openfisca_core.types import ArrayLike, ArrayType, Encodable
+from openfisca_core.types import ArrayLike, ArrayType, SupportsEncode
 
 
 class EnumArray(numpy.ndarray):
@@ -72,7 +72,7 @@ class EnumArray(numpy.ndarray):
     def __new__(
             cls,
             input_array: ArrayType[int],
-            possible_values: Optional[Type[Encodable]] = None,
+            possible_values: Optional[Type[SupportsEncode]] = None,
             ) -> EnumArray:
         """See comment above."""
 
@@ -195,7 +195,7 @@ def _forbidden_operation(self, other: Any) -> NoReturn:
     __and__ = _forbidden_operation
     __or__ = _forbidden_operation
 
-    def decode(self) -> ArrayLike[Encodable]:
+    def decode(self) -> ArrayLike[SupportsEncode]:
         """Decodes itself to a normal array.
 
         Returns: