Merge remote branch 'origin/bsr/resmgr'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d9e4039cda5a71fc0f4bf5f28d261fd428defe0..05c6d7f6209cedcd8df5a731ccf781b5712149d8 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)

diff --git a/src/KERNEL_PY/kernel/datamodeler.py b/src/KERNEL_PY/kernel/datamodeler.py
index 9a58082397bf2a159fb2910a1eecab99f16d2203..f903d655a23233d065bd623018f05d91dd3bee33 100644 (file)
--- a/src/KERNEL_PY/kernel/datamodeler.py
+++ b/src/KERNEL_PY/kernel/datamodeler.py
@@ -45,7 +45,7 @@ UNCHECKED_ATTRIBUTES = [
     "_typemap",
     "_rangemap",
     "_defaultmap",
-    "_voidmap"
+    "_voidmap",
 ]
 
 ## This class is a placeholder for modeling data. An object based on this class
@@ -128,7 +128,7 @@ class DataModeler:
 
     def __setattr__(self, name, val):
         if name in UNCHECKED_ATTRIBUTES:
-            self.__dict__[name] = val
+            object.__setattr__(self, name, val)
             return
 
         #__GBO_DEBUG_
@@ -156,16 +156,19 @@ class DataModeler:
     
     def __getattribute__(self, name):
         if name in UNCHECKED_ATTRIBUTES:
-            return self.__dict__[name]
+            return object.__getattribute__(self, name)
+
+        if name in DataModeler.__dict__:
+            return object.__getattribute__(self, name)
 
         if name not in self._typemap:
-            raise DevelException("The class "+str(self.__class__)+" has no attribute "+str(name))
+            raise DevelException("The class  has no attribute "+str(name))
         # The attribute coulb be requested while it has not been created yet (for
         # example if we did't call the setter before).
-        if name not in self.__dict__:
+        if name not in self.__dict__.keys():
             return None
-        
-        return self.__dict__[name]
+
+        return object.__getattribute__(self, name)
 
     def __isNotValidType(self, name, val):
         isNotValid = (