Merge pull request #14 from xoeye/chore/OP-1150-python-3-10

Typecats 2.0.0

Author: xaviergmail

CHANGES.md

@@ -1,4 +1,4 @@
-# v2.0.0rc1
+# v2.0.0
 
 Breaking changes:
 

README.md

@@ -94,7 +94,7 @@ features. The 4 core features are:
 
    try:
       TestCat.struc(dict(name='', age=0))
-   except StructuringError as ve:
+   except typecats.StructuringError as ve:
       print(ve)
       # Attribute "name" on class <class 'TestCat'> with type <class 'str'> cannot have empty value ''!
    ```

tests/test_gen_converter.py

@@ -1,12 +1,8 @@
 import typing as ty
 
-try:
-    from typing import Protocol
-except ImportError:
-    from typing_extensions import Protocol  # type: ignore
-
 from attr import Factory as fac
 from typecats import Cat, unstruc
+from typecats._compat import Protocol
 from typecats.patch import is_attrs_class
 
 

tests/test_wildcats.py

@@ -1,9 +1,9 @@
-import typing as ty
 import json
+import typing as ty
 
 import pytest
-
 from typecats import Cat
+from typecats.exceptions import StructuringError
 
 from data_utils import ld
 
@@ -215,3 +215,31 @@ class Wildcat2(dict):
     wc.n.i = 8
 
     assert wc != Wildcat2.struc(base)
+
+
+def test_wildcat_struc_with_wildcat_backwards_compatibility():
+    @Cat
+    class Nested(dict):
+        i: int
+
+    @Cat
+    class WithNested:
+        nested: Nested
+
+    # This used to work with BaseConverter but stopped working with GenConverter.
+    c = WithNested.struc(dict(nested=Nested(i=6)))
+    assert c.nested.i == 6
+
+
+def test_wildcat_struc_with_non_wildcat_does_not_work():
+    @Cat
+    class Nested:
+        i: int
+
+    @Cat
+    class WithNested:
+        nested: Nested
+
+    # Make sure that this particular case only works with wildcats
+    with pytest.raises(StructuringError):
+        WithNested.struc(dict(nested=Nested(i=6)))

typecats/__about__.py

@@ -1,4 +1,4 @@
 """typecats"""
-__version__ = "2.0.0rc1"
+__version__ = "2.0.0"
 __author__ = "Peter Gaultney"
 __author_email__ = "pgaultney@xoi.io"

typecats/_compat.py

@@ -1,6 +1,19 @@
 import sys
 
-if sys.version_info[:2] <= (3, 7):
-    from typing_extensions import Literal  # noqa
+version_info = sys.version_info[0:3]
+is_py37 = version_info[:2] == (3, 7)
+is_py38_plus = version_info[:2] >= (3, 8)
+is_py39_plus = version_info[:2] >= (3, 9)
+is_py310_plus = version_info[:2] >= (3, 10)
+is_py311_plus = version_info[:2] >= (3, 11)
+
+if is_py38_plus:
+    from typing import Literal, Protocol  # type: ignore # noqa
+else:
+    from typing_extensions import Literal, Protocol  # type: ignore # noqa
+
+if is_py311_plus:
+    ExceptionGroup = ExceptionGroup  # noqa
+    BaseExceptionGroup = BaseExceptionGroup  # noqa
 else:
-    from typing import Literal  # noqa
+    from exceptiongroup import ExceptionGroup, BaseExceptionGroup  # noqa

typecats/patch.py

@@ -24,7 +24,12 @@ def structure_wildcat_factory(gen_converter: GenConverter, cls):
     def structure_typecat(dictionary, Type):
         try:
             with _consolidate_exceptions(gen_converter, Type):
-                res = base_structure_func(dictionary, Type)
+                if is_wildcat(Type) and isinstance(dictionary, Type):
+                    # Backwards compatibility for Cat.struc({"field": Wildcat(...)}) which worked with
+                    # the legacy BaseConverter but no longer works with GenConverter
+                    res = gen_converter.structure_attrs_fromdict(dictionary, Type)
+                else:
+                    res = base_structure_func(dictionary, Type)
                 if is_wildcat(Type):
                     enrich_structured_wildcat(res, dictionary, Type)
                 return res