Merge f70e79d into 1eb48b8

CHANGELOG.rst

@@ -2,8 +2,8 @@
 CHANGELOG
 =========
 
-0.12.1
-============
+0.12.1, 0.12.2
+==============
 
 * Experimental support for SumType.
 

docs/conf.py

@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '0.12'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.1'
+release = '0.12.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -38,7 +38,7 @@ def requirements(at_path: Path):
 # ----------------------------
 
 setup(name='typeit',
-      version='0.12.1',
+      version='0.12.2',
       description='typeit brings typed data into your project',
       long_description=README,
       classifiers=[

tests/test_parser.py

@@ -12,7 +12,7 @@
 from typeit import parser as p
 from typeit import flags
 from typeit import schema
-from typeit.sums import SumType, Either
+from typeit.sums import Either
 
 
 def test_parser_empty_struct():
@@ -260,7 +260,7 @@ class X(NamedTuple):
     assert isinstance(x.x, Either)
     assert isinstance(x.x, MyEither)
     assert isinstance(x.x, MyEither.Left)
-    assert not isinstance(x.x, Either.Left)
+    assert isinstance(x.x, Either.Left)
     assert not isinstance(x.x, Either.Right)
     assert not isinstance(x.x, MyEither.Right)
     assert isinstance(x.x.err, str)
@@ -278,7 +278,7 @@ class X(NamedTuple):
     assert isinstance(x.x, Either)
     assert isinstance(x.x, MyEither)
     assert isinstance(x.x, MyEither.Right)
-    assert not isinstance(x.x, Either.Right)
+    assert isinstance(x.x, Either.Right)
     assert not isinstance(x.x, Either.Left)
     assert not isinstance(x.x, MyEither.Left)
     assert isinstance(x.x.data, Data)

tests/test_sums.py

@@ -113,7 +113,7 @@ class Right:
     assert isinstance(x, ServiceResponse)
     assert isinstance(x, ServiceResponse.Left)
     assert isinstance(x, Either)
-    assert not isinstance(x, Either.Left)
+    assert isinstance(x, Either.Left)
 
     class AlternativeEither(SumType):
         class Left: ...

typeit/sums/impl.py

@@ -127,10 +127,16 @@ class SumType(metaclass=SumTypeMetaclass):
 
     def __instancecheck__(self, other) -> bool:
         try:
-            return self.__variant_meta__ is other.__variant_meta__
+            m1 = self.__variant_meta__
+            m2 = other.__variant_meta__
         except AttributeError:
             return False
 
+        if not issubclass(m2.variant_of, self.__class__):
+            return False
+
+        return m1.variant_name == m2.variant_name
+
     @classmethod
     def values(cls) -> Set:
         return set(cls.__sum_meta__.values.keys())