Browse Source

Changed the allowed property type

Roland Haroutiounian 9 years ago
parent
commit
70674ea0ac

+ 6
- 2
lodel/leapi/datahandlers/reference.py View File

5
 class Reference(FieldDataHandler):
5
 class Reference(FieldDataHandler):
6
 
6
 
7
     ## @brief Instanciation
7
     ## @brief Instanciation
8
-    # @param allowed bool
8
+    # @param allowed list
9
     # @param internal bool : if False, the field is not internal
9
     # @param internal bool : if False, the field is not internal
10
     # @param **kwargs : other arguments
10
     # @param **kwargs : other arguments
11
-    def __init__(self, allowed=True, internal=False, **kwargs):
11
+    def __init__(self, allowed=[], internal=False, **kwargs):
12
         self.allowed = allowed
12
         self.allowed = allowed
13
         self.internal = internal
13
         self.internal = internal
14
+        '''
14
         if not self.is_ref_valid():
15
         if not self.is_ref_valid():
15
             raise ValueError("The target of the reference is not valid")
16
             raise ValueError("The target of the reference is not valid")
17
+        '''
16
         super().__init__(internal=self.internal, **kwargs)
18
         super().__init__(internal=self.internal, **kwargs)
17
 
19
 
18
     ## @brief gets the target of the reference
20
     ## @brief gets the target of the reference
20
         return self._refs
22
         return self._refs
21
 
23
 
22
     ## @brief checks if the target is valid
24
     ## @brief checks if the target is valid
25
+    '''
23
     def is_ref_valid(self):
26
     def is_ref_valid(self):
24
         relateds = self.get_relateds()
27
         relateds = self.get_relateds()
25
         if not isinstance(relateds, self._refs_class):
28
         if not isinstance(relateds, self._refs_class):
33
                 return False
36
                 return False
34
 
37
 
35
         return True
38
         return True
39
+    '''

+ 4
- 3
lodel/leapi/datahandlers/references/Dict.py View File

7
 
7
 
8
     ## @brief instanciates a dict reference
8
     ## @brief instanciates a dict reference
9
     # @param emclasses dict : Dict of EmClass objects
9
     # @param emclasses dict : Dict of EmClass objects
10
-    # @param allowed bool
10
+    # @param allowed list
11
     # @param internal bool : if False, the field is not internal
11
     # @param internal bool : if False, the field is not internal
12
     # @param kwargs : Other named arguments
12
     # @param kwargs : Other named arguments
13
-    def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
13
+    def __init__(self, emclasses, allowed=[], internal=False, **kwargs):
14
         self._refs = set(emclasses)
14
         self._refs = set(emclasses)
15
         self._refs_class = dict
15
         self._refs_class = dict
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)
17
 
17
 
18
     ## @brief checks if the given target is valid
18
     ## @brief checks if the given target is valid
19
     # @return bool
19
     # @return bool
20
+    '''
20
     def is_target_valid(self):
21
     def is_target_valid(self):
21
         relateds = self.get_relateds()
22
         relateds = self.get_relateds()
22
 
23
 
28
                 return False
29
                 return False
29
 
30
 
30
         return True
31
         return True
31
-
32
+    '''
32
     ## @brief adds a referenced element
33
     ## @brief adds a referenced element
33
     # @param ref_name str : key of the item in the reference dict
34
     # @param ref_name str : key of the item in the reference dict
34
     # @param emclass EmClass
35
     # @param emclass EmClass

+ 2
- 2
lodel/leapi/datahandlers/references/Link.py View File

7
 
7
 
8
     ## @brief instanciates a link reference
8
     ## @brief instanciates a link reference
9
     # @param emclass EmClass : linked object
9
     # @param emclass EmClass : linked object
10
-    # @param allowed bool
10
+    # @param allowed list
11
     # @param internal bool : if False, the field is not internal
11
     # @param internal bool : if False, the field is not internal
12
     # @param kwargs : Other named arguments
12
     # @param kwargs : Other named arguments
13
-    def __init__(self, emclass, allowed=True, internal=False, **kwargs):
13
+    def __init__(self, emclass, allowed=[], internal=False, **kwargs):
14
         self._refs = emclass
14
         self._refs = emclass
15
         self._refs_class = EmClass
15
         self._refs_class = EmClass
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)

+ 4
- 1
lodel/leapi/datahandlers/references/List.py View File

7
 
7
 
8
     ## @brief instanciates a list reference
8
     ## @brief instanciates a list reference
9
     # @param emclasses list : linked emclasses objects
9
     # @param emclasses list : linked emclasses objects
10
-    def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
10
+    # @param allowed list
11
+    # @param internal bool
12
+    # @param kwargs
13
+    def __init__(self, emclasses, allowed=[], internal=False, **kwargs):
11
         self._refs = emclasses
14
         self._refs = emclasses
12
         self._refs_class = list
15
         self._refs_class = list
13
         super().__init__(self, allowed=allowed, internal=internal, **kwargs)
16
         super().__init__(self, allowed=allowed, internal=internal, **kwargs)

+ 2
- 2
lodel/leapi/datahandlers/references/Set.py View File

7
 
7
 
8
     ## @brief instanciates a set reference
8
     ## @brief instanciates a set reference
9
     # @param emclasses list : List of EmClass objects
9
     # @param emclasses list : List of EmClass objects
10
-    # @param allowed bool
10
+    # @param allowed list
11
     # @param internal bool : if False, the field is not internal
11
     # @param internal bool : if False, the field is not internal
12
     # @param kwargs : Other named arguments
12
     # @param kwargs : Other named arguments
13
-    def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
13
+    def __init__(self, emclasses, allowed=[], internal=False, **kwargs):
14
         self._refs = set(emclasses)
14
         self._refs = set(emclasses)
15
         self._refs_class = set
15
         self._refs_class = set
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)
16
         super().__init__(allowed=allowed, internal=internal, **kwargs)

Loading…
Cancel
Save