Refactoring on the can_override method in data_handlers types

lodel/leapi/datahandlers/data_fields/bool.py

@@ -20,10 +20,3 @@ class DataHandler(DataField):
         except(ValueError, TypeError):
             error = TypeError("The value '%s' is not, and will never, be a boolean" % value)
         return (value, error)
-
-    def can_override(self, data_handler):
-
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-
-        return True

lodel/leapi/datahandlers/data_fields/datetime.py

@@ -15,10 +15,3 @@ class DataHandler(DataField):
         self.now_on_update = now_on_update
         self.now_on_create = now_on_create
         super().__init__(**kwargs)
-
-    def can_override(self, data_handler):
-
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-
-        return True

lodel/leapi/datahandlers/data_fields/file.py

@@ -13,7 +13,4 @@ class DataHandler(DataField):
         self.upload_path = upload_path
         super().__init__(ftype='file', **kwargs)
 
-    def can_override(self, data_handler):
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-        return True
+

lodel/leapi/datahandlers/data_fields/format.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import warnings
-from .varchar import EmDataField as VarcharDataField
+from .varchar import DataHandler as VarcharDataHandler
 
 
-class DataHandler(VarcharDataField):
+class DataHandler(VarcharDataHandler):
 
     help = 'Automatic string field, designed to use the str % operator to build its content'
     base_type = 'char'
@@ -19,8 +19,9 @@ class DataHandler(VarcharDataField):
         super().__init__(internal='automatic', max_length=max_length)
 
     def can_override(self, data_handler):
-        if data_handler.__class__.base_type != self.__class__.base_type:
+        if not super().can_override(data_handler):
             return False
+
         if data_handler.max_length != self.max_length:
             return False
 

lodel/leapi/datahandlers/data_fields/integer.py

@@ -18,7 +18,3 @@ class DataHandler(FieldDataHandler):
             error = TypeError("The value '%s' is not, and will never, be an integer" % value)
         return (value, error)
 
-    def can_override(self, data_handler):
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-        return True

lodel/leapi/datahandlers/data_fields/regexvarchar.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import re
-from .varchar import EmDataField as VarcharDataField
+from .varchar import DataHandler as VarcharDataHandler
 
 
-class DataHandler(VarcharDataField):
+class DataHandler(VarcharDataHandler):
 
     help = 'String field validated with a regex. Takes two options : max_length and regex'
     base_type = 'char'
@@ -26,8 +26,9 @@ class DataHandler(VarcharDataField):
         return (value, error)
 
     def can_override(self, data_handler):
-        if data_handler.__class__.base_type != self.__class__.base_type:
+        if not super().can_override(data_handler):
             return False
+
         if data_handler.max_length != self.max_length:
             return False
         return True

lodel/leapi/datahandlers/data_fields/text.py

@@ -14,9 +14,3 @@ class DataHandler(DataField):
             return False
         return True
 
-    def can_override(self, data_handler):
-
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-
-        return True

lodel/leapi/datahandlers/data_fields/uid.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from .integer import EmDataField as IntegerDataField
+from .integer import DataHandler as IntegerDataHandler
 
 
-class DataHandler(IntegerDataField):
+class DataHandler(IntegerDataHandler):
 
     help = 'Fieldtype designed to handle editorial model UID'
     base_type = 'int'
@@ -16,9 +16,3 @@ class DataHandler(IntegerDataField):
 
     def _check_data_value(self, value):
         return (value, None)
-
-    def can_override(self,data_handler):
-        if data_handler.__class__.base_type != self.__class__.base_type:
-            return False
-
-        return True

lodel/leapi/datahandlers/data_fields/varchar.py

@@ -15,7 +15,7 @@ class DataHandler(DataField):
 
     def can_override(self, data_handler):
 
-        if data_handler.__class__.base_type != self.__class__.base_type:
+        if not super().can_override(data_handler):
             return False
 
         if data_handler.max_length != self.max_length:

lodel/leapi/datahandlers/field_data_handler.py

@@ -43,6 +43,11 @@ class FieldDataHandler(object):
     def _check_data_value(self, value):
         return (value, None)
 
+    def can_override(self, data_handler):
+        if data_handler.__class__.base_type != self.__class__.base_type:
+            return False
+        return True
+
     ## @brief Build field value
     # @param emcomponent EmComponent : An EmComponent child class instance
     # @param fname str : The field name