Merge pull request #14 from lmignon/master-fix-isinstance

Fix isinstance and issublcass method on multi levels inheritance hier…

news/isinstance.bugfix

@@ -0,0 +1 @@
+Fix isinstance and issublcass method on multi levels inheritance hierarchy.

src/extendable/main.py

@@ -254,6 +254,9 @@ def __subclasscheck__(cls, subclass: Any) -> bool:  # noqa: B902
         """Implement issubclass(sub, cls)."""
         if hasattr(subclass, "__xreg_all_base_names__"):
             return cls.__xreg_name__ in subclass.__xreg_all_base_names__
+        if hasattr(subclass, "__xreg_name__"):
+            _subclass = subclass._get_assembled_cls()
+            return issubclass(_subclass, cls)
         return isinstance(subclass, type) and super().__subclasscheck__(subclass)
 
     def _get_assembled_cls(

src/extendable/registry.py

@@ -114,7 +114,7 @@ def build_extendable_class(
         self, class_def: main.ExtendableClassDef
     ) -> main.ExtendableMeta:
         """Build the class hierarchy from the first one to the last one into the
-        hierachy definition."""
+        hierarchy definition."""
         name = class_def.name
         for idx, cls_def in enumerate(class_def.hierarchy):
             # retrieve extendable_parent
@@ -153,6 +153,9 @@ def build_extendable_class(
             base = cast(main.ExtendableMeta, extendableClass)
             self[name] = base
         base.__xreg_all_base_names__ = set(class_def.base_names)
+        for _base in bases:
+            if hasattr(_base, "__xreg_all_base_names__"):
+                base.__xreg_all_base_names__ |= _base.__xreg_all_base_names__
         return base
 
     @contextmanager

tests/test_simple.py

@@ -256,3 +256,49 @@ class MyExt(metaclass=MyMeta):
         pass
 
     assert MyMeta._is_extendable(MyExt)
+
+
+def test_issubclass_multi_level(test_registry):
+    class A(metaclass=ExtendableMeta):
+        pass
+
+    class B(A):
+        pass
+
+    class C(B):
+        pass
+
+    test_registry.init_registry()
+
+    assert issubclass(C, B)
+    assert issubclass(C().__class__, B)
+    assert issubclass(C().__class__, B().__class__)
+    assert issubclass(C, B().__class__)
+    assert issubclass(C, A)
+    assert issubclass(C().__class__, A)
+    assert issubclass(C, A().__class__)
+    assert issubclass(C().__class__, A().__class__)
+    assert issubclass(B, A)
+    assert issubclass(B().__class__, A)
+    assert issubclass(B().__class__, A().__class__)
+    assert issubclass(B, A().__class__)
+
+
+def test_isinstance_multi_level(test_registry):
+    class A(metaclass=ExtendableMeta):
+        pass
+
+    class B(A):
+        pass
+
+    class C(B):
+        pass
+
+    test_registry.init_registry()
+
+    assert isinstance(C(), B)
+    assert isinstance(C(), B().__class__)
+    assert isinstance(C(), A)
+    assert isinstance(C(), A().__class__)
+    assert isinstance(B(), A)
+    assert isinstance(B(), A().__class__)