Roland Haroutiounian 9 lat temu
rodzic
commit
9986d068c0

+ 2
- 2
lodel/leapi/datahandlers/data_field.py Wyświetl plik

@@ -29,8 +29,8 @@ class DataField(FieldDataHandler):
29 29
     def check_data_value(self, value):
30 30
         if value is None:
31 31
             if not self.nullable:
32
-                return (None, TypeError("'None' value but field is not nullable"))
32
+                return None, TypeError("'None' value but field is not nullable")
33 33
 
34
-            return (None, None)
34
+            return None, None
35 35
         return super().check_data_value(value)
36 36
 

+ 1
- 1
lodel/leapi/datahandlers/data_fields/bool.py Wyświetl plik

@@ -19,4 +19,4 @@ class DataHandler(DataField):
19 19
             value = bool(value)
20 20
         except(ValueError, TypeError):
21 21
             error = TypeError("The value '%s' is not, and will never, be a boolean" % value)
22
-        return (value, error)
22
+        return value, error

+ 1
- 3
lodel/leapi/datahandlers/data_fields/file.py Wyświetl plik

@@ -11,6 +11,4 @@ class DataHandler(DataField):
11 11
     # @param **kwargs
12 12
     def __init__(self, upload_path=None, **kwargs):
13 13
         self.upload_path = upload_path
14
-        super().__init__(ftype='file', **kwargs)
15
-
16
-
14
+        super().__init__(**kwargs)

+ 1
- 2
lodel/leapi/datahandlers/data_fields/format.py Wyświetl plik

@@ -18,11 +18,10 @@ class DataHandler(VarcharDataHandler):
18 18
         self._format_string = format_string
19 19
         super().__init__(internal='automatic', max_length=max_length)
20 20
 
21
+
21 22
     def can_override(self, data_handler):
22 23
         if not super().can_override(data_handler):
23 24
             return False
24
-
25 25
         if data_handler.max_length != self.max_length:
26 26
             return False
27
-
28 27
         return True

+ 1
- 1
lodel/leapi/datahandlers/data_fields/integer.py Wyświetl plik

@@ -16,5 +16,5 @@ class DataHandler(FieldDataHandler):
16 16
             value = int(value)
17 17
         except(ValueError, TypeError):
18 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
 

+ 1
- 1
lodel/leapi/datahandlers/data_fields/regexvarchar.py Wyświetl plik

@@ -23,7 +23,7 @@ class DataHandler(VarcharDataHandler):
23 23
         if not self.compiled_re.match(value):
24 24
             value = ''
25 25
             error = TypeError('"%s" doesn\'t match the regex "%s"' % (value, self.regex))
26
-        return (value, error)
26
+        return value, error
27 27
 
28 28
     def can_override(self, data_handler):
29 29
         if not super().can_override(data_handler):

+ 0
- 6
lodel/leapi/datahandlers/data_fields/text.py Wyświetl plik

@@ -8,9 +8,3 @@ class DataHandler(DataField):
8 8
 
9 9
     def __init__(self, **kwargs):
10 10
         super(self.__class__, self).__init__(ftype='text', **kwargs)
11
-
12
-    def can_override(self, data_handler):
13
-        if data_handler.__class__.base_type != self.__class__.base_type:
14
-            return False
15
-        return True
16
-

+ 1
- 1
lodel/leapi/datahandlers/data_fields/uid.py Wyświetl plik

@@ -15,4 +15,4 @@ class DataHandler(IntegerDataHandler):
15 15
         super(self.__class__, self).__init__(is_id_class=is_id_class, **kwargs)
16 16
 
17 17
     def _check_data_value(self, value):
18
-        return (value, None)
18
+        return value, None

+ 3
- 3
lodel/leapi/datahandlers/data_fields/varchar.py Wyświetl plik

@@ -13,12 +13,12 @@ class DataHandler(DataField):
13 13
         self.max_length = int(max_length)
14 14
         super().__init__(**kwargs)
15 15
 
16
+    ## @brief checks if this class can override the given data handler
17
+    # @param data_handler DataHandler
18
+    # @return bool
16 19
     def can_override(self, data_handler):
17
-
18 20
         if not super().can_override(data_handler):
19 21
             return False
20
-
21 22
         if data_handler.max_length != self.max_length:
22 23
             return False
23
-
24 24
         return True

+ 6
- 2
lodel/leapi/datahandlers/field_data_handler.py Wyświetl plik

@@ -11,7 +11,8 @@ class FieldDataHandler(object):
11 11
 
12 12
     ## @brief constructor
13 13
     # @param internal False | str : define whether or not a field is internal
14
-    # @param immutable bool : indicates if the fieldtype has to be defined in child classes of LeObject or if it is designed globally and immutable
14
+    # @param immutable bool : indicates if the fieldtype has to be defined in child classes of LeObject or if it is
15
+    #                         designed globally and immutable
15 16
     # @param **args
16 17
     # @throw NotImplementedError if it is instanciated directly
17 18
     def __init__(self, internal=False, immutable=False, **args):
@@ -41,8 +42,11 @@ class FieldDataHandler(object):
41 42
         return self._check_data_value(value)
42 43
 
43 44
     def _check_data_value(self, value):
44
-        return (value, None)
45
+        return value, None
45 46
 
47
+    ## @brief checks if this class can override the given data handler
48
+    # @param data_handler DataHandler
49
+    # @return bool
46 50
     def can_override(self, data_handler):
47 51
         if data_handler.__class__.base_type != self.__class__.base_type:
48 52
             return False

+ 7
- 6
lodel/leapi/datahandlers/reference.py Wyświetl plik

@@ -17,12 +17,13 @@ class Reference(FieldDataHandler):
17 17
     def get_relateds(self):
18 18
         return self._refs
19 19
 
20
-    ## @brief checks if the target is valid
21
-
20
+    ## @brief checks if the data value is valid
21
+    # @param value
22
+    # @return
22 23
     def check_data_value(self, value):
23 24
 
24 25
         if not isinstance(value, self._refs_class):
25
-            return (value, "The reference should be an instance of %s, %s gotten" % (self._refs_class, value.__class__))
26
+            return value, "The reference should be an instance of %s, %s gotten" % (self._refs_class, value.__class__)
26 27
 
27 28
         if isinstance(value, EmClass):
28 29
             value = [value]
@@ -32,6 +33,6 @@ class Reference(FieldDataHandler):
32 33
 
33 34
         for related in value:
34 35
             if not isinstance(related, EmClass):
35
-                return (value, "The reference %s should be an instance of EmClass, %s gotten" % (related.display_name, related.__class__))
36
-
37
-        return (value, None)
36
+                return value, "The reference %s should be an instance of EmClass, %s gotten" % (related.display_name,
37
+                                                                                                related.__class__)
38
+        return value, None

+ 1
- 1
lodel/leapi/datahandlers/references/dict.py Wyświetl plik

@@ -9,7 +9,7 @@ class DataHandler(Reference):
9 9
     # @param allowed_classes list | None : list of allowed em classes if None no restriction
10 10
     # @param internal bool : if False, the field is not internal
11 11
     # @param kwargs : Other named arguments
12
-    def __init__(self, allowed_classes = None, internal=False, **kwargs):
12
+    def __init__(self, allowed_classes=None, internal=False, **kwargs):
13 13
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)
14 14
 
15 15
     ## @brief checks if the given target is valid

+ 1
- 1
lodel/leapi/datahandlers/references/link.py Wyświetl plik

@@ -9,5 +9,5 @@ class DataHandler(Reference):
9 9
     # @param allowed_classes list | None : list of allowed em classes if None no restriction
10 10
     # @param internal bool : if False, the field is not internal
11 11
     # @param kwargs : Other named arguments
12
-    def __init__(self, allowed_classes = None, internal=False, **kwargs):
12
+    def __init__(self, allowed_classes=None, internal=False, **kwargs):
13 13
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)

+ 1
- 1
lodel/leapi/datahandlers/references/list.py Wyświetl plik

@@ -9,7 +9,7 @@ class DataHandler(Reference):
9 9
     # @param allowed_classes list | None : list of allowed em classes if None no restriction
10 10
     # @param internal bool
11 11
     # @param kwargs
12
-    def __init__(self, allowed_classes = None, internal=False, **kwargs):
12
+    def __init__(self, allowed_classes=None, internal=False, **kwargs):
13 13
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)
14 14
 
15 15
     ## @brief adds a referenced element

+ 1
- 1
lodel/leapi/datahandlers/references/set.py Wyświetl plik

@@ -9,7 +9,7 @@ class DataHandler(Reference):
9 9
     # @param allowed_classes list | None : list of allowed em classes if None no restriction
10 10
     # @param internal bool : if False, the field is not internal
11 11
     # @param kwargs : Other named arguments
12
-    def __init__(self, allowed_classes = None, internal=False, **kwargs):
12
+    def __init__(self, allowed_classes=None, internal=False, **kwargs):
13 13
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)
14 14
 
15 15
     ## @brief adds a referenced element

+ 3
- 3
lodel/utils/mlstring.py Wyświetl plik

@@ -1,9 +1,10 @@
1 1
 #-*- coding: utf-8 -*-
2 2
 
3
-import hashlib
4 3
 import copy
4
+import hashlib
5 5
 import json
6 6
 
7
+
7 8
 ## @brief Stores multilangage string
8 9
 class MlString(object):
9 10
     
@@ -41,7 +42,7 @@ class MlString(object):
41 42
         elif lang in self.values:
42 43
             return self.values[lang]
43 44
         else:
44
-           return str(self)
45
+            return str(self)
45 46
 
46 47
     ## @brief Set a translation
47 48
     # @param lang str : the lang
@@ -103,4 +104,3 @@ class MlString(object):
103 104
 
104 105
     def __repr__(self):
105 106
         return repr(self.values)
106
-    

Loading…
Anuluj
Zapisz