enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Pyolian: fixes for recent eolian changes

This commit is contained in:
Davide Andreoli 2018-11-28 21:39:51 +01:00
parent 433b561e27
commit ccb3e81046
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scripts/pyolian/eolian.py
View File

@ -700,7 +700,7 @@ class Class(Object):
def do_class_recursive(cls): def do_class_recursive(cls):
if cls.parent: if cls.parent:
L.append(cls.parent) L.append(cls.parent)
for other in cls.inherits: for other in cls.extensions:
if other not in L: if other not in L:
L.append(other) L.append(other)
do_class_recursive(other) do_class_recursive(other)
@ -711,16 +711,12 @@ class Class(Object):
@cached_property @cached_property
def hierarchy(self): def hierarchy(self):
L = [] L = []
base = self.base_class base = self.parent
while base: while base:
L.append(base) L.append(base)
base = base.base_class base = base.parent
return L return L
@cached_property
def base_class(self):
return self.parent
@cached_property @cached_property
def ctor_enable(self): def ctor_enable(self):
return bool(lib.eolian_class_ctor_enable_get(self)) return bool(lib.eolian_class_ctor_enable_get(self))

1
src/scripts/pyolian/test_eolian.py
View File

@ -327,7 +327,6 @@ class TestEolianClass(unittest.TestCase):
self.assertIsNone(cls.eo_prefix) # TODO fin a class with a value self.assertIsNone(cls.eo_prefix) # TODO fin a class with a value
self.assertIsNone(cls.event_prefix) # TODO same as above self.assertIsNone(cls.event_prefix) # TODO same as above
self.assertIsNone(cls.data_type) # 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(cls.parent.name, 'Efl.Loop_Consumer')
self.assertEqual([c.name for c in cls.extensions], []) self.assertEqual([c.name for c in cls.extensions], [])
self.assertEqual([c.name for c in cls.hierarchy], ['Efl.Loop_Consumer', 'Efl.Object']) self.assertEqual([c.name for c in cls.hierarchy], ['Efl.Loop_Consumer', 'Efl.Object'])