Merge branch 'newlodel' of git.labocleo.org:lodel2 into newlodel

lodel/leapi/datahandlers/data_field.py

         if self.__class__ == DataField:
             raise NotImplementedError("Abstract class")
 
-        super().__init__(internal, **kwargs)
+        super(self.__class__, self).__init__(internal, **kwargs)
 
         self.nullable = nullable
         self.uniq = uniq

lodel/leapi/datahandlers/data_fields/__init__.py

-__author__ = 'roland'
+

lodel/leapi/datahandlers/data_fields/bool.py

     def __init__(self, **kwargs):
         if 'check_data_value' not in kwargs:
             kwargs['check_data_value'] = self.check_value
-        super(Bool, self).__init__(ftype='bool', **kwargs)
+        super(self.__class__, self).__init__(ftype='bool', **kwargs)
 
-    def check_value(self, value):
+    def _check_data_value(self, value):
         error = None
         try:
             value = bool(value)

lodel/leapi/datahandlers/data_fields/datetime.py

     def __init__(self, now_on_update=False, now_on_create=False, **kwargs):
         self.now_on_update = now_on_update
         self.now_on_create = now_on_create
-        super(Datetime, self).__init__(**kwargs)
+        super(self.__class__, self).__init__(**kwargs)

lodel/leapi/datahandlers/data_fields/file.py

     # @param **kwargs
     def __init__(self, upload_path=None, **kwargs):
         self.upload_path = upload_path
-        super(File, self).__init__(ftype='file', **kwargs)
+        super(self.__class__, self).__init__(ftype='file', **kwargs)

lodel/leapi/datahandlers/data_fields/format.py

     def __init__(self, format_string, field_list, max_length, **kwargs):
         self._field_list = field_list
         self._format_string = format_string
-        super().__init__(internal='automatic', max_length=max_length)
+        super(self.__class__, self).__init__(internal='automatic', max_length=max_length)

lodel/leapi/datahandlers/data_fields/integer.py

     ftype = 'int'
 
     def __init__(self, **kwargs):
-        super(Integer, self).__init__(ftype='int', **kwargs)
+        super(self.__class__, self).__init__(ftype='int', **kwargs)
 
     def _check_data_value(self, value):
         error = None

lodel/leapi/datahandlers/data_fields/regexvarchar.py

         self.regex = regex
         self.compiled_re = re.compile(regex)  # trigger an error if invalid regex
 
-        super().__init__(max_length=max_length, **kwargs)
+        super(self.__class__, self).__init__(max_length=max_length, **kwargs)
 
     def _check_data_value(self, value):
         error = None

lodel/leapi/datahandlers/data_fields/text.py

     help = 'A text field (big string)'
     ftype = 'text'
 
-    def __init__(self):
-        super(Text, self).__init__(ftype='text', **kwargs)
+    def __init__(self, **kwargs):
+        super(self.__class__, self).__init__(ftype='text', **kwargs)

lodel/leapi/datahandlers/data_fields/uid.py

     def __init__(self, is_id_class, **kwargs):
         self._is_id_class = is_id_class
         kwargs['internal'] = 'automatic'
-        super().__init__(is_id_class=is_id_class, **kwargs)
+        super(self.__class__, self).__init__(is_id_class=is_id_class, **kwargs)
 
     def _check_data_value(self, value):
         return (value, None)

lodel/leapi/datahandlers/data_fields/varchar.py

     # @brief max_length int: The maximum length of this field
     def __init__(self, max_length=64, **kwargs):
         self.max_length = int(max_length)
-        super().__init__(**kwargs)
+        super(self.__class__, self).__init__(**kwargs)

lodel/leapi/datahandlers/field_data_handler.py

 # -*- coding: utf-8 -*-
 import importlib
 
+
 class FieldDataHandler(object):
 
     help_text = 'Generic Field Data Handler'
     # @param internal False | str : define whether or not a field is internal
     # @param immutable bool : indicates if the fieldtype has to be defined in child classes of LeObject or if it is designed globally and immutable
     # @param **args
+    # @throw NotImplementedError if it is instanciated directly
     def __init__(self, internal=False, immutable=False, **args):
+        if self.__class__ == GenericFieldType:
+            raise NotImplementedError("Abstract class")
+
         self.internal = internal  # Check this value ?
         self.immutable = bool(immutable)
 
     ## @brief checks if a fieldtype is internal
     # @return bool
     def is_internal(self):
-        return self.internal != False
+        return self.internal is not False
 
     ## @brief calls the data_field defined _check_data_value() method
     # @return tuple (value, error|None)
     def _check_data_value(self, value):
         return (value, None)
 
+    ## @brief Build field value
+    # @param emcomponent EmComponent : An EmComponent child class instance
+    # @param fname str : The field name
+    # @param datas dict : dict storing fields values (from the component)
+    # @param cur_value : the value from the current field (identified by fieldname)
+    def construct_data(self, emcomponent, fname, datas, cur_value):
+        emcomponent_fields = emcomponent.fields()
+        fname_data_handler = None
+        if fname in emcomponent_fields:
+            fname_data_handler = FieldDataHandler.from_name(emcomponent_fields[fname])
+
+        if fname in datas.keys():
+            return cur_value
+        elif fname_data_handler is not None and hasattr(fname_data_handler, 'default'):
+                return fname_data_handler.default
+        elif fname_data_handler is not None and fname_data_handler.nullable:
+                return None
+
+        raise RuntimeError("Unable to construct data for field %s", fname)
+
+    ## @brief Check datas consistency
+    # @param emcomponent EmComponent : An EmComponent child class instance
+    # @param fname : the field name
+    # @param datas dict : dict storing fields values
+    # @return an Exception instance if fails else True
+    # @todo A implémenter
+    def check_data_consistency(self, emcomponent, fname, datas):
+        return True
+
     ## @brief given a field type name, returns the associated python class
     # @param fieldtype_name str : A field type name
     # @return DataField child class