str-to-obj 2025.1__tar.gz → 2025.3__tar.gz

{str_to_obj-2025.1 → str_to_obj-2025.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: str-to-obj
-Version: 2025.1
+Version: 2025.3
 Summary: Convert strings to Python objects guided by (potentially annotated) type hints
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/str-to-obj/
 Author: Eric Debreuve

{str_to_obj-2025.1 → str_to_obj-2025.3}/package/str_to_obj/main.py

@@ -29,11 +29,7 @@ def ObjectFromStr(
             issues = [f'{string}: Invalid value; Expected="NONE" or "None" or "none".']
         return None, issues
 
-    # value = _ObjectFromStr(string)
-    try:
-        value = bstr.literal_eval(string)
-    except (SyntaxError, ValueError):
-        value = string
+    value = _ObjectFromStr(string)
 
     if expected_type is None:
         return value, []
@@ -41,21 +37,21 @@ def ObjectFromStr(
     return CastValue(value, expected_type)
 
 
-# def _ObjectFromStr(string: str | h.Any, /)-> h.Any:
-#     """"""
-#     # if not isinstance(string, str):
-#     #     return string
-#
-#     try:
-#         value = bstr.literal_eval(string)
-#     except (SyntaxError, ValueError):
-#         value = string
-#
-#     # if isinstance(value, h.Sequence) and not isinstance(value, str):
-#     #     stripe = type(value)
-#     #     value = stripe(_ObjectFromStr(_elm) for _elm in value)
-#
-#     return value
+def _ObjectFromStr(string: str | h.Any, /)-> h.Any:
+    """"""
+    if not isinstance(string, str):
+        return string
+
+    try:
+        value = bstr.literal_eval(string)
+    except (SyntaxError, ValueError):
+        value = string
+
+    if isinstance(value, h.Sequence) and not isinstance(value, str):
+        stripe = type(value)
+        value = stripe(_ObjectFromStr(_elm) for _elm in value)
+
+    return value
 
 
 """

{str_to_obj-2025.1 → str_to_obj-2025.3}/package/str_to_obj/type/hint_tree.py

@@ -17,9 +17,10 @@ from str_to_obj.type.hint import (
     any_hint_h,
     complex_hint_additions_h,
     non_complex_hint_h,
-    simple_hint_h,
 )
 
+hint_node_type_h = non_complex_hint_h | t.UnionType | t.EllipsisType | type[t.NoneType]
+
 
 @d.dataclass(slots=True, repr=False, eq=False)
 class _hint_node_t:
@@ -29,7 +30,7 @@ class _hint_node_t:
     otherwise.
     """
 
-    type: non_complex_hint_h | t.UnionType | t.EllipsisType | type[t.NoneType]
+    type: hint_node_type_h
     annotations: tuple[annotation_t, ...] = d.field(default_factory=tuple)
     literal_s: tuple[h.Any, ...] | None = None
 
@@ -112,7 +113,7 @@ class hint_t(_hint_node_t):
         return output
 
     @property
-    def template(self) -> simple_hint_h | dict[int, h.Any] | None:
+    def template(self) -> type[hint_node_type_h] | dict[int, h.Any] | None:
         """"""
         if self.type is t.NoneType:
             return None

{str_to_obj-2025.1 → str_to_obj-2025.3}/package/str_to_obj/version.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-__version__ = "2025.1"
+__version__ = "2025.3"
 
 
 """

{str_to_obj-2025.1 → str_to_obj-2025.3}/package/str_to_obj.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: str-to-obj
-Version: 2025.1
+Version: 2025.3
 Summary: Convert strings to Python objects guided by (potentially annotated) type hints
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/str-to-obj/
 Author: Eric Debreuve