enumplus 1.2.0__tar.gz → 1.2.1__tar.gz

{enumplus-1.2.0 → enumplus-1.2.1}/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.1] - 2026-08-23
+
+### Fixed
+
+- `to_dict()` and `to_json()` no longer double-evaluate callable labels — the callable is invoked exactly once and the result is reused in both the top-level `label` field and the `metadata` dict.
+- `__version__` is now loaded dynamically from package metadata via `importlib.metadata`, eliminating version mismatch between `__init__.py` and `pyproject.toml`.
+- `__contains__`, `from_value()`, `is_valid()`, and `get()` no longer produce false positives when passed a foreign enum member with the same value as a member of the queried enum.
+- `__contains__`, `from_value()`, `is_valid()`, and `get()` now correctly handle members whose value is an enum member from another class. Previously, the foreign-enum guard rejected all foreign enum members, making it impossible to look up such members by value.
+- `to_json()` now uses `SerializableEncoder` internally, so members whose value (or metadata) is an enum member from another class are serialized correctly instead of raising `TypeError`.
+- `_safe_equal()` now catches all exceptions (not just `TypeError` and `ValueError`) from custom `__eq__` implementations, preventing crashes when comparing with objects that raise unexpected exceptions.
+- Falsy but valid labels (`0`, `""`, `False`) are now respected instead of being silently replaced by `name.title()`. Only `None` and missing labels trigger the fallback.
+- Removed dead `_serialize_value` function from `serialize.py`.
+- Updated `SECURITY.md` to include `1.2.x` in supported versions.
+
 ## [1.2.0] - 2026-08-23
 
 ### Fixed
@@ -70,7 +84,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Pydantic v2 integration via `__get_pydantic_core_schema__`.
 - Full test suite, CI, and release workflows.
 
-[Unreleased]: https://github.com/MathiasPaulenko/enumpy/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/MathiasPaulenko/enumpy/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/MathiasPaulenko/enumpy/releases/tag/v1.2.1
 [1.2.0]: https://github.com/MathiasPaulenko/enumpy/releases/tag/v1.2.0
 [1.1.0]: https://github.com/MathiasPaulenko/enumpy/releases/tag/v1.1.0
 [1.0.0]: https://github.com/MathiasPaulenko/enumpy/releases/tag/v1.0.0

{enumplus-1.2.0 → enumplus-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: enumplus
-Version: 1.2.0
+Version: 1.2.1
 Summary: Enhanced Python enums with metadata, serialization, and choices
 Project-URL: Homepage, https://pypi.org/project/enumplus/
 Project-URL: Repository, https://github.com/MathiasPaulenko/enumpy

{enumplus-1.2.0 → enumplus-1.2.1}/SECURITY.md

@@ -4,6 +4,7 @@
 
 | Version | Supported          |
 |---------|--------------------|
+| 1.2.x   | :white_check_mark: |
 | 1.1.x   | :white_check_mark: |
 | < 1.1   | :x:                |
 

{enumplus-1.2.0 → enumplus-1.2.1}/enumplus/__init__.py

@@ -4,9 +4,15 @@ Drop-in replacement for ``enum.Enum`` with labels, metadata, serialization,
 and Pydantic v2 integration.
 """
 
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as _pkg_version
+
 from enumplus.enum import Enum, OrderedEnum
 from enumplus.serialize import SerializableEncoder
 
-__version__ = "1.1.0"
+try:
+    __version__ = _pkg_version("enumplus")
+except PackageNotFoundError:  # pragma: no cover
+    __version__ = "0.0.0.dev0"
 
 __all__ = ["Enum", "OrderedEnum", "SerializableEncoder", "__version__"]

{enumplus-1.2.0 → enumplus-1.2.1}/enumplus/enum.py

@@ -58,20 +58,21 @@ class _EnumPlusDict(EnumDict):
 
 
 def _safe_equal(a: Any, b: Any) -> bool:
-    """Return ``a == b`` as a bool, swallowing shape/length comparison errors.
+    """Return ``a == b`` as a bool, swallowing comparison errors.
 
     Handles values whose ``__eq__`` may raise (e.g. NumPy arrays with shape
-    mismatches) or return non-boolean objects (e.g. arrays, ``NotImplemented``).
+    mismatches, custom objects with side-effecting ``__eq__``) or return
+    non-boolean objects (e.g. arrays, ``NotImplemented``).
     """
     try:
         result = a == b
-    except (TypeError, ValueError):
+    except Exception:
         return False
     if result is NotImplemented:
         return False
     try:
         return bool(result)
-    except (TypeError, ValueError):
+    except Exception:
         return False
 
 
@@ -147,7 +148,7 @@ class EnumMeta(enum.EnumMeta):
             member._metadata_ = metadata
 
             label = metadata.get("label")
-            if not label:
+            if label is None:
                 member._label_ = member.name.title()
             else:
                 member._label_ = label
@@ -160,6 +161,13 @@ class EnumMeta(enum.EnumMeta):
         if isinstance(item, cls):
             return True
         member: Any
+        if isinstance(item, enum.Enum):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is item:
+                    return True
+            return False
         for member in cls:
             if _safe_equal(member.value, item):
                 return True
@@ -185,7 +193,7 @@ class Enum(enum.Enum, metaclass=EnumMeta):
     - Pydantic v2 integration
     """
 
-    _label_: str
+    _label_: Any
     _metadata_: dict[str, Any]
     _index_: int
 
@@ -272,6 +280,16 @@ class Enum(enum.Enum, metaclass=EnumMeta):
             ValueError: If no match is found and no default is provided.
         """
         member: Any
+        if isinstance(value, enum.Enum) and not isinstance(value, cls):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is value:
+                    return member
+            if default is not _SENTINEL:
+                return default
+            raise ValueError(f"{value!r} is not a valid {cls.__name__} value")
+
         if case_insensitive and isinstance(value, str):
             lowered = value.lower()
             for member in cls:
@@ -336,6 +354,13 @@ class Enum(enum.Enum, metaclass=EnumMeta):
     @classmethod
     def is_valid(cls, value: Any) -> bool:
         """Return ``True`` if ``value`` is a valid member or member value."""
+        if isinstance(value, enum.Enum) and not isinstance(value, cls):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is value:
+                    return True
+            return False
         for member in cls:
             if member is value or _safe_equal(member.value, value):
                 return True
@@ -424,13 +449,17 @@ class Enum(enum.Enum, metaclass=EnumMeta):
         """Serialize the enum to a nested dict with ``value``, ``label``, ``metadata``."""
         result: dict[str, dict[str, Any]] = {}
         for member in cls:
+            label = member.label
+            metadata: dict[str, Any] = {}
+            for k, v in member._metadata_.items():
+                if k == "label" and callable(v):
+                    metadata[k] = label
+                else:
+                    metadata[k] = v
             result[member.name] = {
                 "value": member.value,
-                "label": member.label,
-                "metadata": {
-                    k: (v() if callable(v) and k == "label" else v)
-                    for k, v in member._metadata_.items()
-                },
+                "label": label,
+                "metadata": metadata,
             }
         return result
 

{enumplus-1.2.0 → enumplus-1.2.1}/enumplus/serialize.py

@@ -8,18 +8,6 @@ from enumplus.enum import Enum
 __all__ = ["SerializableEncoder", "from_json", "to_json"]
 
 
-def _serialize_value(value: Any, *, evaluate_callable: bool = False) -> Any:
-    """Serialize a single metadata value.
-
-    Only callables in the ``label`` key are evaluated; all other values are
-    returned as-is so that function references or class objects stored in
-    metadata are not accidentally invoked.
-    """
-    if evaluate_callable and callable(value):
-        return value()
-    return value
-
-
 def to_json(cls: type[Enum]) -> str:
     """Serialize an enum class to a pretty-printed JSON string.
 
@@ -32,22 +20,26 @@ def to_json(cls: type[Enum]) -> str:
           ]
         }
     """
+    members: list[dict[str, Any]] = []
+    for member in cls:
+        label = member.label
+        metadata: dict[str, Any] = {}
+        for k, v in member._metadata_.items():
+            if k == "label" and callable(v):
+                metadata[k] = label
+            else:
+                metadata[k] = v
+        members.append({
+            "name": member.name,
+            "value": member.value,
+            "label": label,
+            "metadata": metadata,
+        })
     data: dict[str, Any] = {
         "name": cls.__name__,
-        "members": [
-            {
-                "name": member.name,
-                "value": member.value,
-                "label": member.label,
-                "metadata": {
-                    k: _serialize_value(v, evaluate_callable=(k == "label"))
-                    for k, v in member._metadata_.items()
-                },
-            }
-            for member in cls
-        ],
+        "members": members,
     }
-    return json.dumps(data, ensure_ascii=False, indent=2)
+    return json.dumps(data, ensure_ascii=False, indent=2, cls=SerializableEncoder)
 
 
 def from_json(data: str) -> dict[str, Any]:

{enumplus-1.2.0 → enumplus-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "enumplus"
-version = "1.2.0"
+version = "1.2.1"
 description = "Enhanced Python enums with metadata, serialization, and choices"
 readme = "README.md"
 requires-python = ">=3.11"