From 3abf402cfb10332d1855c2b96984323fd150251a Mon Sep 17 00:00:00 2001 From: prieto Date: Thu, 2 Feb 2017 14:58:24 +0100 Subject: [PATCH] Inheritance of MlNamedObject --- lodel/editorial_model/components.py | 5 +++-- lodel/editorial_model/model.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lodel/editorial_model/components.py b/lodel/editorial_model/components.py index ff27133..6735fc8 100644 --- a/lodel/editorial_model/components.py +++ b/lodel/editorial_model/components.py @@ -12,6 +12,7 @@ import hashlib from lodel.context import LodelContext LodelContext.expose_modules(globals(), { 'lodel.utils.mlstring': ['MlString'], + 'lodel.mlnamedobject': ['MlNamedObject'], 'lodel.settings': ['Settings'], 'lodel.editorial_model.exceptions': ['EditorialModelError', 'assert_edit'], 'lodel.leapi.leobject': ['CLASS_ID_FIELDNAME']}) @@ -20,7 +21,7 @@ LodelContext.expose_modules(globals(), { # @see EmClass EmField # @todo forbid '.' in uid #@ingroup lodel2_em -class EmComponent(object): +class EmComponent(MlNamedObject): ##@brief Instanciate an EmComponent # @param uid str : uniq identifier @@ -268,7 +269,7 @@ class EmField(EmComponent): ##@brief Handles functionnal group of EmComponents #@ingroup lodel2_em -class EmGroup(object): +class EmGroup(MlNamedObject): ##@brief Create a new EmGroup # @note you should NEVER call the constructor yourself. Use Model.add_group instead diff --git a/lodel/editorial_model/model.py b/lodel/editorial_model/model.py index 5bdf0b0..4fd9707 100644 --- a/lodel/editorial_model/model.py +++ b/lodel/editorial_model/model.py @@ -7,6 +7,7 @@ import copy from lodel.context import LodelContext LodelContext.expose_modules(globals(), { 'lodel.utils.mlstring': ['MlString'], + 'lodel.mlnamedobject': ['MlNamedObject'], 'lodel.logger': 'logger', 'lodel.settings': ['Settings'], 'lodel.settings.utils': ['SettingsError'], @@ -16,7 +17,7 @@ LodelContext.expose_modules(globals(), { ##@brief Describe an editorial model #@ingroup lodel2_em -class EditorialModel(object): +class EditorialModel(MlNamedObject): ##@brief Create a new editorial model # @param name MlString|str|dict : the editorial model name