Merge pull request #450 from satra/enh/booleantraits

Enh/booleantraits

Author: chrisgorgo

nipype/interfaces/base.py

@@ -1132,20 +1132,14 @@ def _format_arg(self, name, trait_spec, value):
         Formats a trait containing argstr metadata
         """
         argstr = trait_spec.argstr
+        iflogger.debug('%s_%s' %(name, str(value)))
         if trait_spec.is_trait_type(traits.Bool):
             if value:
                 # Boolean options have no format string. Just append options
                 # if True.
                 return argstr
             else:
-                # If we end up here we're trying to add a Boolean to
-                # the arg string but whose value is False.  This
-                # should not happen, something went wrong upstream.
-                # Raise an error.
-                msg = "Object '%s' attempting to format argument " \
-                    "string for attr '%s' with value '%s'."  \
-                    % (self, trait_spec.name, value)
-                raise ValueError(msg)
+                return None
         #traits.Either turns into traits.TraitCompound and does not have any inner_traits
         elif trait_spec.is_trait_type(traits.List) \
         or (trait_spec.is_trait_type(traits.TraitCompound) \
@@ -1201,6 +1195,8 @@ def _parse_inputs(self, skip=None):
                 else:
                     continue
             arg = self._format_arg(name, spec, value)
+            if arg is None:
+                continue
             pos = spec.position
             if pos is not None:
                 if pos >= 0:

nipype/interfaces/slicer/generate_classes.py

@@ -101,8 +101,8 @@ def generate_class(module,launcher):
     #self._outputs_nodes = []
 
     class_string = "\"\"\""
-    
-    
+
+
 
     for desc_str in ['title', 'category', 'description', 'version',
                      'documentation-url', 'license', 'contributor',

nipype/interfaces/tests/test_base.py

@@ -259,6 +259,7 @@ class CommandLineInputSpec1(nib.CommandLineInputSpec):
                               position=-1)
         noo = nib.traits.Int(argstr='-x %d', desc='an int')
         roo = nib.traits.Str(desc='not on command line')
+        soo = nib.traits.Bool(argstr="-soo")
     nib.CommandLine.input_spec = CommandLineInputSpec1
     ci4 = nib.CommandLine(command='cmd')
     ci4.inputs.foo = 'foo'
@@ -267,10 +268,15 @@ class CommandLineInputSpec1(nib.CommandLineInputSpec):
     ci4.inputs.moo = [1, 2, 3]
     ci4.inputs.noo = 0
     ci4.inputs.roo = 'hello'
+    ci4.inputs.soo = False
     cmd = ci4._parse_inputs()
     yield assert_equal, cmd[0], '-g'
     yield assert_equal, cmd[-1], '-i 1 -i 2 -i 3'
     yield assert_true, 'hello' not in ' '.join(cmd)
+    yield assert_true, '-soo' not in ' '.join(cmd)
+    ci4.inputs.soo = True
+    cmd = ci4._parse_inputs()
+    yield assert_true, '-soo' in ' '.join(cmd)
 
     class CommandLineInputSpec2(nib.CommandLineInputSpec):
         foo = nib.File(argstr='%s', desc='a str', genfile=True)