Pyolian: fixes for recent eolian changes
authorDave Andreoli <dave@gurumeditation.it>
Wed, 28 Nov 2018 20:39:51 +0000 (21:39 +0100)
committerHermet Park <hermetpark@gmail.com>
Wed, 5 Dec 2018 05:50:10 +0000 (14:50 +0900)
src/scripts/pyolian/eolian.py
src/scripts/pyolian/test_eolian.py

index 49d288d..0df4bc8 100644 (file)
@@ -700,7 +700,7 @@ class Class(Object):
         def do_class_recursive(cls):
             if cls.parent:
                 L.append(cls.parent)
-            for other in cls.inherits:
+            for other in cls.extensions:
                 if other not in L:
                     L.append(other)
                 do_class_recursive(other)
@@ -711,17 +711,13 @@ class Class(Object):
     @cached_property
     def hierarchy(self):
         L = []
-        base = self.base_class
+        base = self.parent
         while base:
             L.append(base)
-            base = base.base_class
+            base = base.parent
         return L
 
     @cached_property
-    def base_class(self):
-        return self.parent
-
-    @cached_property
     def ctor_enable(self):
         return bool(lib.eolian_class_ctor_enable_get(self))
 
index a1ab85b..23f172c 100755 (executable)
@@ -327,7 +327,6 @@ class TestEolianClass(unittest.TestCase):
         self.assertIsNone(cls.eo_prefix)  # TODO fin a class with a value
         self.assertIsNone(cls.event_prefix)  # TODO same as above
         self.assertIsNone(cls.data_type)  # TODO same as above
-        self.assertEqual(cls.base_class.name, 'Efl.Loop_Consumer')
         self.assertEqual(cls.parent.name, 'Efl.Loop_Consumer')
         self.assertEqual([c.name for c in cls.extensions], [])
         self.assertEqual([c.name for c in cls.hierarchy], ['Efl.Loop_Consumer', 'Efl.Object'])