str-to-obj 2025.1__py3-none-any.whl → 2025.3__py3-none-any.whl

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/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/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.dist-info → str_to_obj-2025.3.dist-info}/METADATA

@@ -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.dist-info → str_to_obj-2025.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 str_to_obj/__init__.py,sha256=R22_7BvT9x1iJjVZzl1MraNV1TR73TBxnmiYasVp_Kw,2645
-str_to_obj/main.py,sha256=rzKdcK_qJ7IR29aIOZCDoNhQVfFV-EgF-pf35SNwDXA,3592
-str_to_obj/version.py,sha256=xNV5y9HqVZrz1nqjMLfqnMFHZE0yv6lVMBi5BS2quKQ,2206
+str_to_obj/main.py,sha256=oxAWYP1tlED9Xk-GXJ45H_fUFYN9aNAOVK8rIvMd5dM,3441
+str_to_obj/version.py,sha256=C8ZnOk6zy1HZcG0OVBHibqjKlpRCJy7cq2Ar9rGopww,2206
 str_to_obj/api/catalog.py,sha256=6ka6JciGdHFP93lg0yq2LO3iZBHfq0upZfXxQSg1izk,2521
 str_to_obj/api/type.py,sha256=yxD5wTtnh_h8Wa9_k1eex-nrkjtfh4ZJI6Db6hJHI9w,2468
 str_to_obj/catalog/boolean.py,sha256=G2ZkLqf1e3cpMzjiGgd3E0aAVs6_xlpzG3U2LiOFbio,3508
@@ -17,10 +17,10 @@ str_to_obj/task/comparison.py,sha256=HBzv7gBtOnROsC6Sq-FYpgd_MKzVJreboNiqkza3vJ8
 str_to_obj/task/inspection.py,sha256=M8YnYq4A_Zz7rC2kgTYSSSawTnG2dCug5FBoCOBJ5g8,3127
 str_to_obj/type/annotation.py,sha256=xXShME2Q344N3QlsqKtU6ttne54tTVC3b62CHU1TGUM,3838
 str_to_obj/type/hint.py,sha256=w-yos8eD4CHQsXPfnqeqAc-ozyDWqzw46FOWDtAh7dM,2810
-str_to_obj/type/hint_tree.py,sha256=0A0X-waAWLs8Q3MQ4FXlqQaIUXz6cDhBgw8vloIj0x4,7895
+str_to_obj/type/hint_tree.py,sha256=DA69tIjrjQixPcLQCgI3MEnbIPDsRRNNYOb0SLA3pUI,7922
 str_to_obj/type/type.py,sha256=ywc7GpzM1BsoQ3F0qk4wZ2DG1KZllw-PNv_umIGt8hA,4147
 str_to_obj/type/value.py,sha256=r9Ko5HHant1JGbsO7vH1unRBr9guc61Jz2piuJT0BjM,2533
-str_to_obj-2025.1.dist-info/METADATA,sha256=Lxej_DybExSfQvS6D5v_LVvvE7Gcd6GylHCpF4oHIUs,6717
-str_to_obj-2025.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-str_to_obj-2025.1.dist-info/top_level.txt,sha256=h-6bR_TAnXRGVSLTeNPlivlaG64xYM3E__Xg7sCgeug,11
-str_to_obj-2025.1.dist-info/RECORD,,
+str_to_obj-2025.3.dist-info/METADATA,sha256=j-MjI8mpKIm1deFIgL3P0Y0dpP_giJeC0t36dvI2o1I,6717
+str_to_obj-2025.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+str_to_obj-2025.3.dist-info/top_level.txt,sha256=h-6bR_TAnXRGVSLTeNPlivlaG64xYM3E__Xg7sCgeug,11
+str_to_obj-2025.3.dist-info/RECORD,,