Browse Source

Refactoring on the can_override method in data_handlers types

Roland Haroutiounian 9 years ago
parent
commit
c075992819

+ 0
- 7
lodel/leapi/datahandlers/data_fields/bool.py View File

20
         except(ValueError, TypeError):
20
         except(ValueError, TypeError):
21
             error = TypeError("The value '%s' is not, and will never, be a boolean" % value)
21
             error = TypeError("The value '%s' is not, and will never, be a boolean" % value)
22
         return (value, error)
22
         return (value, error)
23
-
24
-    def can_override(self, data_handler):
25
-
26
-        if data_handler.__class__.base_type != self.__class__.base_type:
27
-            return False
28
-
29
-        return True

+ 0
- 7
lodel/leapi/datahandlers/data_fields/datetime.py View File

15
         self.now_on_update = now_on_update
15
         self.now_on_update = now_on_update
16
         self.now_on_create = now_on_create
16
         self.now_on_create = now_on_create
17
         super().__init__(**kwargs)
17
         super().__init__(**kwargs)
18
-
19
-    def can_override(self, data_handler):
20
-
21
-        if data_handler.__class__.base_type != self.__class__.base_type:
22
-            return False
23
-
24
-        return True

+ 1
- 4
lodel/leapi/datahandlers/data_fields/file.py View File

13
         self.upload_path = upload_path
13
         self.upload_path = upload_path
14
         super().__init__(ftype='file', **kwargs)
14
         super().__init__(ftype='file', **kwargs)
15
 
15
 
16
-    def can_override(self, data_handler):
17
-        if data_handler.__class__.base_type != self.__class__.base_type:
18
-            return False
19
-        return True
16
+

+ 4
- 3
lodel/leapi/datahandlers/data_fields/format.py View File

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 import warnings
2
 import warnings
3
-from .varchar import EmDataField as VarcharDataField
3
+from .varchar import DataHandler as VarcharDataHandler
4
 
4
 
5
 
5
 
6
-class DataHandler(VarcharDataField):
6
+class DataHandler(VarcharDataHandler):
7
 
7
 
8
     help = 'Automatic string field, designed to use the str % operator to build its content'
8
     help = 'Automatic string field, designed to use the str % operator to build its content'
9
     base_type = 'char'
9
     base_type = 'char'
19
         super().__init__(internal='automatic', max_length=max_length)
19
         super().__init__(internal='automatic', max_length=max_length)
20
 
20
 
21
     def can_override(self, data_handler):
21
     def can_override(self, data_handler):
22
-        if data_handler.__class__.base_type != self.__class__.base_type:
22
+        if not super().can_override(data_handler):
23
             return False
23
             return False
24
+
24
         if data_handler.max_length != self.max_length:
25
         if data_handler.max_length != self.max_length:
25
             return False
26
             return False
26
 
27
 

+ 0
- 4
lodel/leapi/datahandlers/data_fields/integer.py View File

18
             error = TypeError("The value '%s' is not, and will never, be an integer" % value)
18
             error = TypeError("The value '%s' is not, and will never, be an integer" % value)
19
         return (value, error)
19
         return (value, error)
20
 
20
 
21
-    def can_override(self, data_handler):
22
-        if data_handler.__class__.base_type != self.__class__.base_type:
23
-            return False
24
-        return True

+ 4
- 3
lodel/leapi/datahandlers/data_fields/regexvarchar.py View File

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 import re
2
 import re
3
-from .varchar import EmDataField as VarcharDataField
3
+from .varchar import DataHandler as VarcharDataHandler
4
 
4
 
5
 
5
 
6
-class DataHandler(VarcharDataField):
6
+class DataHandler(VarcharDataHandler):
7
 
7
 
8
     help = 'String field validated with a regex. Takes two options : max_length and regex'
8
     help = 'String field validated with a regex. Takes two options : max_length and regex'
9
     base_type = 'char'
9
     base_type = 'char'
26
         return (value, error)
26
         return (value, error)
27
 
27
 
28
     def can_override(self, data_handler):
28
     def can_override(self, data_handler):
29
-        if data_handler.__class__.base_type != self.__class__.base_type:
29
+        if not super().can_override(data_handler):
30
             return False
30
             return False
31
+
31
         if data_handler.max_length != self.max_length:
32
         if data_handler.max_length != self.max_length:
32
             return False
33
             return False
33
         return True
34
         return True

+ 0
- 6
lodel/leapi/datahandlers/data_fields/text.py View File

14
             return False
14
             return False
15
         return True
15
         return True
16
 
16
 
17
-    def can_override(self, data_handler):
18
-
19
-        if data_handler.__class__.base_type != self.__class__.base_type:
20
-            return False
21
-
22
-        return True

+ 2
- 8
lodel/leapi/datahandlers/data_fields/uid.py View File

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
-from .integer import EmDataField as IntegerDataField
2
+from .integer import DataHandler as IntegerDataHandler
3
 
3
 
4
 
4
 
5
-class DataHandler(IntegerDataField):
5
+class DataHandler(IntegerDataHandler):
6
 
6
 
7
     help = 'Fieldtype designed to handle editorial model UID'
7
     help = 'Fieldtype designed to handle editorial model UID'
8
     base_type = 'int'
8
     base_type = 'int'
16
 
16
 
17
     def _check_data_value(self, value):
17
     def _check_data_value(self, value):
18
         return (value, None)
18
         return (value, None)
19
-
20
-    def can_override(self,data_handler):
21
-        if data_handler.__class__.base_type != self.__class__.base_type:
22
-            return False
23
-
24
-        return True

+ 1
- 1
lodel/leapi/datahandlers/data_fields/varchar.py View File

15
 
15
 
16
     def can_override(self, data_handler):
16
     def can_override(self, data_handler):
17
 
17
 
18
-        if data_handler.__class__.base_type != self.__class__.base_type:
18
+        if not super().can_override(data_handler):
19
             return False
19
             return False
20
 
20
 
21
         if data_handler.max_length != self.max_length:
21
         if data_handler.max_length != self.max_length:

+ 5
- 0
lodel/leapi/datahandlers/field_data_handler.py View File

43
     def _check_data_value(self, value):
43
     def _check_data_value(self, value):
44
         return (value, None)
44
         return (value, None)
45
 
45
 
46
+    def can_override(self, data_handler):
47
+        if data_handler.__class__.base_type != self.__class__.base_type:
48
+            return False
49
+        return True
50
+
46
     ## @brief Build field value
51
     ## @brief Build field value
47
     # @param emcomponent EmComponent : An EmComponent child class instance
52
     # @param emcomponent EmComponent : An EmComponent child class instance
48
     # @param fname str : The field name
53
     # @param fname str : The field name

Loading…
Cancel
Save