fix isinstance checks

OpenVoiceOS · Sep 19, 2023 · 2aff7fc · 2aff7fc
1 parent c0a775f
commit 2aff7fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ovos_workshop/skills/mycroft_skill.py b/ovos_workshop/skills/mycroft_skill.py
@@ -113,10 +113,12 @@ def __instancecheck__(self, instance):
         if is_classic_core():
             # instance imported from vanilla mycroft
             from mycroft.skills import MycroftSkill as _CoreSkill
-            if issubclass(self.__class__, _CoreSkill):
+            if issubclass(instance.__class__, _CoreSkill):
                 return True
 
-        return super().__instancecheck__(instance)
+        from ovos_workshop.skills.ovos import OVOSSkill
+        return super().__instancecheck__(instance) or \
+            issubclass(instance.__class__, OVOSSkill)
 
 
 class MycroftSkill(BaseSkill, metaclass=_SkillMetaclass):

diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py
@@ -30,7 +30,7 @@ def __instancecheck__(self, instance):
                 return True
 
         return super().__instancecheck__(instance) or \
-            issubclass(self.__class__, MycroftSkill)
+            issubclass(instance.__class__, MycroftSkill)
 
 
 class OVOSSkill(BaseSkill, metaclass=_OVOSSkillMetaclass):