fixed capsul tests, removed th euse of obsolete traits types (ListStr..)

Author: denisri

capsul/engine/module/attributes.py

@@ -4,18 +4,11 @@
 
 '''
 
-from __future__ import absolute_import
-
-import os
-import six
 from capsul.attributes.attributes_factory import AttributesFactory
 from capsul.attributes.attributes_schema import AttributesSchema, \
     ProcessAttributes
 from capsul.attributes.completion_engine \
     import ProcessCompletionEngineFactory, PathCompletionEngineFactory
-from capsul.engine import settings
-import capsul.engine
-import os.path as osp
 from functools import partial
 import weakref
 
@@ -143,7 +136,7 @@ def validate_config(widget):
         traits.List(traits.Str(), desc='attributes shchemas modules names'))
     controller.add_trait(
         'attributes_schemas',
-        traits.DictStrStr(desc='attributes shchemas names'))
+        traits.Dict(str, str, desc='attributes shchemas names'))
     controller.add_trait(
         'process_completion',
         traits.Str(desc='process completion model name'))

capsul/engine/module/somaworkflow.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 
 from capsul import engine
 import traits.api as traits
 from traits.api import Undefined
-import os
-import six
 
 
 def init_settings(capsul_engine):
@@ -135,8 +132,8 @@ def validate_config(widget):
     controller.add_trait('path_translations',
                          traits.Dict(
                             key_trait=traits.Directory,
-                            value_trait=traits.ListStr(['', ''], minlen=2,
-                                                       maxlen=2),
+                            value_trait=traits.List(str)(['', ''], minlen=2,
+                                                         maxlen=2),
                             value={}, output=False,
                             desc=''))
 

capsul/pipeline/pipeline_tools.py

@@ -42,9 +42,6 @@
 -----------------------
 '''
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 # System import
 import os
 import logging
@@ -1272,7 +1269,20 @@ def load_pipeline_parameters(filename, pipeline):
             except traits.TraitError:
                 # This case happen when the trait type is date, time or datetime
                 # Couldn't find an other solution for now
-                setattr(pipeline, trait_name, None)
+                if trait_value not in (None, traits.Undefined, ''):
+                    t = pipeline.trait(trait_name)
+                    if isinstance(t.trait_type, traits.Date):
+                        trait_value = date.fromisoformat(trait_value)
+                    elif isinstance(t.trait_type, traits.Time):
+                        trait_value = time.fromisoformat(trait_value)
+                    elif isinstance(t.trait_type, traits.Datetime):
+                        trait_value = datetime.fromisoformat(trait_value)
+                    else:
+                        trait_value = None
+                try:
+                    setattr(pipeline, trait_name, trait_value)
+                except traits.TraitError:
+                    setattr(pipeline, trait_name, traits.Undefined)
 
         pipeline.update_nodes_and_plugs_activation()
 

capsul/pipeline/test/test_pipeline_parameters.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function
-
-from __future__ import absolute_import
 import os
 import json
 import shutil
@@ -745,8 +742,8 @@ def pipeline_definition(self):
         # Reinitializing pipeline and loading parameters
         pipeline1 = Pipeline1()
         load_pipeline_parameters(self.path, pipeline1)
-        self.assertEqual(pipeline1.in_1, None)
-        self.assertEqual(pipeline1.in_2, None)
+        self.assertEqual(pipeline1.in_1, in_1)
+        self.assertEqual(pipeline1.in_2, in_2)
         self.assertEqual(pipeline1.out, out)
 
         self.assertEqual(type(pipeline1.out), TraitListObject)

capsul/study_config/config_modules/attributes_config.py

@@ -8,10 +8,7 @@
 -------------------------
 '''
 
-from __future__ import absolute_import
-import os
-import six
-from traits.api import Bool, Str, Undefined, List, DictStrStr
+from traits.api import Str, Undefined, List, Dict
 from capsul.study_config.study_config import StudyConfigModule
 from capsul.attributes.attributes_factory import AttributesFactory
 from capsul.attributes.attributes_schema import AttributesSchema, \
@@ -45,7 +42,7 @@ def __init__(self, study_config, configuration):
             desc='attributes shchema module name', groups=['attributes']))
         self.study_config.add_trait(
             'attributes_schemas',
-            DictStrStr(output=False,
+            Dict(str, str, output=False,
                 desc='attributes shchemas names', groups=['attributes']))
         self.study_config.add_trait(
             'process_completion',