aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts/pyolian
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2018-11-28 21:39:51 +0100
committerDave Andreoli <dave@gurumeditation.it>2018-11-28 21:39:51 +0100
commitccb3e81046f28fa39b0278b799d547f693c6b12a (patch)
tree53e206a968820836b63bb7bc01751dff62848cce /src/scripts/pyolian
parentPyolian tests: 2 small improvements (diff)
downloadefl-ccb3e81046f28fa39b0278b799d547f693c6b12a.tar.gz
Pyolian: fixes for recent eolian changes
Diffstat (limited to 'src/scripts/pyolian')
-rw-r--r--src/scripts/pyolian/eolian.py10
-rwxr-xr-xsrc/scripts/pyolian/test_eolian.py1
2 files changed, 3 insertions, 8 deletions
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 49d288df89..0df4bc8f10 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -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))
diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py
index a1ab85b2e3..23f172c4c3 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -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'])