typedparser 0.10.6__tar.gz → 0.11.2__tar.gz

{typedparser-0.10.6 → typedparser-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typedparser
-Version: 0.10.6
+Version: 0.11.2
 Summary: Extension for python argparse with typehints and typechecks.
 Author: simon-ging
 License: Apache-2.0
@@ -181,7 +181,7 @@ Note: Some tests are skipped for python 3.7.
 
 ~~~bash
 pip install -e .
-pip install pytest pytest-cov pylint pytest-lazy-fixture
+pip install pytest pytest-cov pylint
 pylint typedparser
 
 # run tests

{typedparser-0.10.6 → typedparser-0.11.2}/README.md

@@ -154,7 +154,7 @@ Note: Some tests are skipped for python 3.7.
 
 ~~~bash
 pip install -e .
-pip install pytest pytest-cov pylint pytest-lazy-fixture
+pip install pytest pytest-cov pylint
 pylint typedparser
 
 # run tests

{typedparser-0.10.6 → typedparser-0.11.2}/src/typedparser/__init__.py

@@ -28,5 +28,5 @@ def define(*args, **kwargs):
     )
 
 
-__version__ = "0.10.6"
+__version__ = "0.11.2"
 

{typedparser-0.10.6 → typedparser-0.11.2}/src/typedparser/_typedattr.py

@@ -1,7 +1,4 @@
-import attrs
 import collections
-from attr import has, AttrsInstance
-from attrs import define, fields_dict, fields, Attribute
 from functools import partial
 from inspect import isclass
 from pathlib import Path
@@ -21,8 +18,16 @@ from typing import (
     Callable,
 )
 
+import attrs
+from attr import has, AttrsInstance
+from attrs import define, fields_dict, fields, Attribute
+
 from .objects import check_object_equality, RecursorInterface, StrictRecursor, AttrsClass
-from types import  UnionType
+
+try:
+    from types import UnionType
+except ImportError:
+    UnionType = None
 
 try:
     # python>=3.8
@@ -290,7 +295,7 @@ def _parse_nested(
         # f" depth={depth} type annotation origin={origin} args={args}"
     )
 
-    def maybe_raise_typeerorr(full_err_msg):
+    def maybe_raise_typeerror(full_err_msg):
         if strict:
             raise TypeError(full_err_msg)
         _print_fn(f"Caught: {full_err_msg}. Returning as is.")
@@ -314,15 +319,20 @@ def _parse_nested(
         return value
 
     # resolve unions (mostly "optional")
-    if origin == Union or isinstance(typ, UnionType):
+    if origin == Union or (UnionType is not None and isinstance(typ, UnionType)):
+        collected_errors = []
         for new_typ in args:
             try:
                 # force strict parsing and catch errors to try all different types
                 return parse_recursive(name, value, new_typ, strict=True)
-            except TypeError:
-                pass
+            except TypeError as e:
+                collected_errors.append(f"{e}")
         # if we get here, none of the types worked
-        return maybe_raise_typeerorr(f"{err_msg}. No type in Union matches.")
+        collected_error_str = "\n".join(collected_errors)
+        return maybe_raise_typeerror(
+            f"No type in Union matches. Errors per type:\n{collected_error_str}\n"
+            f"Final error: {err_msg}"
+        )
 
     final_list_type = None
 
@@ -331,9 +341,9 @@ def _parse_nested(
         if not (len(args) == 2 and args[1] == Ellipsis):
             # resolve fixed tuple
             if not recursor.is_iterable_fn(value):
-                return maybe_raise_typeerorr(f"{err_msg}. Expect a sequence, got {type(value)}")
+                return maybe_raise_typeerror(f"{err_msg}. Expect a sequence, got {type(value)}")
             if len(value) != len(args):
-                return maybe_raise_typeerorr(
+                return maybe_raise_typeerror(
                     f"{err_msg}. Expect a sequence with length {len(args)}, got length {len(value)}"
                 )
             new_tuple = []
@@ -347,7 +357,7 @@ def _parse_nested(
     # check dict
     if origin in (dict, collections.defaultdict):
         if not recursor.is_mapping_fn(value):
-            return maybe_raise_typeerorr(f"{err_msg}. Expect a mapping, got {type(value)}")
+            return maybe_raise_typeerror(f"{err_msg}. Expect a mapping, got {type(value)}")
         if len(args) == 0:
             args = [Any, Any]
         dict_keytype, dict_valuetype = args
@@ -375,7 +385,7 @@ def _parse_nested(
     # resolve list
     if origin == list:
         if not recursor.is_iterable_fn(value):
-            return maybe_raise_typeerorr(f"{err_msg}. Expect iterable, got {type(value)}")
+            return maybe_raise_typeerror(f"{err_msg}. Expect iterable, got {type(value)}")
         list_arg_type = args[0]
         list_output = []
         for item in value:
@@ -404,7 +414,7 @@ def _parse_nested(
     except TypeError:
         is_sc = False
     if is_sc:
-        return maybe_raise_typeerorr(f"{err_msg}. Abstract collections are not supported.")
+        return maybe_raise_typeerror(f"{err_msg}. Abstract collections are not supported.")
 
     # add explicit conversions
     for convert_source, convert_target, convert_callable in conversions:

{typedparser-0.10.6 → typedparser-0.11.2}/src/typedparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typedparser
-Version: 0.10.6
+Version: 0.11.2
 Summary: Extension for python argparse with typehints and typechecks.
 Author: simon-ging
 License: Apache-2.0
@@ -181,7 +181,7 @@ Note: Some tests are skipped for python 3.7.
 
 ~~~bash
 pip install -e .
-pip install pytest pytest-cov pylint pytest-lazy-fixture
+pip install pytest pytest-cov pylint
 pylint typedparser
 
 # run tests