tiramisu/function.py

@@ -333,39 +333,14 @@ class CalcValue:
                         value = value[index]
                     else:
                         value = None
-        else:
+        elif None in value and not allow_none:
-            if join is not None:
+            value = []
-                if None not in value:
+        elif remove_duplicate_value:
-                    length_val = None
+            new_value = []
-                    for val in value:
+            for val in value:
-                        if isinstance(val, list):
+                if val not in new_value:
-                            if None in val:
+                    new_value.append(val)
-                                length_val = None
+            value = new_value
-                                break
-                            lval = len(val)
-                            if length_val is not None and length_val != lval:
-                                raise ValueError(_(f'unexpected value in calc_value with join attribute "{val}" with invalid length "{length_val}"'))
-                            length_val = lval
-                    new_value = []
-                    for idx in range(length_val):
-                        idx_val = []
-                        for val in value:
-                            if isinstance(val, list):
-                                idx_val.append(val[idx])
-                            else:
-                                idx_val.append(val)
-                        new_value.append(join.join(idx_val))
-                    value = new_value
-                else:
-                    value = []
-            elif None in value and not allow_none:
-                value = []
-            elif remove_duplicate_value:
-                new_value = []
-                for val in value:
-                    if val not in new_value:
-                        new_value.append(val)
-                value = new_value
         return value
 
     def value_from_kwargs(self,