jetpytools 2.0.2__tar.gz → 2.1.0__tar.gz

{jetpytools-2.0.2 → jetpytools-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 2.0.2
+Version: 2.1.0
 Summary: Collection of stuff that's useful in general python programming
 Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/jetpytools
 Project-URL: Contact, https://discord.gg/XTpc6Fa9eB

{jetpytools-2.0.2 → jetpytools-2.1.0}/jetpytools/_metadata.py

@@ -1,6 +1,6 @@
 """Collection of stuff that's useful in general python programming"""
 
-__version__ = "2.0.2"
+__version__ = "2.1.0"
 
 __author_name__, __author_email__ = "Jaded Encoding Thaumaturgy", "jaded.encoding.thaumaturgy@gmail.com"
 __maintainer_name__, __maintainer_email__ = __author_name__, __author_email__

{jetpytools-2.0.2 → jetpytools-2.1.0}/jetpytools/enums/base.py

@@ -1,23 +1,24 @@
 from __future__ import annotations
 
-from enum import Enum
+from abc import ABCMeta
+from enum import Enum, EnumMeta
 from typing import Any, Self
 
-from ..exceptions import CustomValueError, NotFoundEnumValue
+from ..exceptions import NotFoundEnumValueError
 from ..types import FuncExcept
 
-__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum"]
+__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum", "EnumABCMeta"]
+
+
+class EnumABCMeta(EnumMeta, ABCMeta):
+    """Metaclass combining EnumMeta and ABCMeta to support abstract enumerations."""
 
 
 class CustomEnum(Enum):
     """Base class for custom enums."""
 
     @classmethod
-    def _missing_(cls, value: Any) -> Self | None:
-        return cls.from_param(value)
-
-    @classmethod
-    def from_param(cls, value: Any, func_except: FuncExcept | None = None) -> Self | None:
+    def from_param(cls, value: Any, func_except: FuncExcept | None = None) -> Self:
         """
         Return the enum value from a parameter.
 
@@ -28,44 +29,37 @@ class CustomEnum(Enum):
 
         :raises NotFoundEnumValue:   Variable not found in the given enum.
         """
-
-        if value is None:
-            return None
-
-        if func_except is None:
-            func_except = cls.from_param
-
-        if isinstance(value, cls):
-            return value
-
-        if value is cls:
-            raise CustomValueError("You must select a member, not pass the enum!", func_except)
+        func_except = func_except or cls.from_param
 
         try:
             return cls(value)
-        except Exception:
+        except (ValueError, TypeError):
             pass
 
         if isinstance(func_except, tuple):
             func_name, var_name = func_except
         else:
-            func_name, var_name = func_except, str(cls)
+            func_name, var_name = func_except, repr(cls)
 
-        raise NotFoundEnumValue(
+        raise NotFoundEnumValueError(
             'The given value for "{var_name}" argument must be a valid {enum_name}, not "{value}"!\n'
             "Valid values are: [{readable_enum}].",
             func_name,
             var_name=var_name,
             enum_name=cls,
             value=value,
-            readable_enum=iter([f"{x.name} ({x.value})" for x in cls]),
+            readable_enum=(f"{name} ({value!r})" for name, value in cls.__members__.items()),
             reason=value,
-        )
+        ) from None
 
 
 class CustomIntEnum(int, CustomEnum):
     """Base class for custom int enums."""
 
+    _value_: int
+
 
 class CustomStrEnum(str, CustomEnum):
     """Base class for custom str enums."""
+
+    _value_: str