BF: use traits.Str (py2/3 compat) instead of traits.Unicode.

Author: Ben Cipollini

nipype/interfaces/freesurfer/model.py

@@ -23,15 +23,15 @@
 class MRISPreprocInputSpec(FSTraitedSpec):
     out_file = File(argstr='--out %s', genfile=True,
                    desc='output filename')
-    target = traits.Unicode(argstr='--target %s', mandatory=True,
+    target = traits.Str(argstr='--target %s', mandatory=True,
                          desc='target subject name')
     hemi = traits.Enum('lh', 'rh', argstr='--hemi %s',
                        mandatory=True,
                        desc='hemisphere for source and target')
-    surf_measure = traits.Unicode(argstr='--meas %s',
+    surf_measure = traits.Str(argstr='--meas %s',
                              xor=('surf_measure', 'surf_measure_file', 'surf_area'),
                 desc='Use subject/surf/hemi.surf_measure as input')
-    surf_area = traits.Unicode(argstr='--area %s',
+    surf_area = traits.Str(argstr='--area %s',
                           xor=('surf_measure', 'surf_measure_file', 'surf_area'),
        desc='Extract vertex area from subject/surf/hemi.surfname to use as input.')
     subjects = traits.List(argstr='--s %s...',
@@ -46,8 +46,8 @@ class MRISPreprocInputSpec(FSTraitedSpec):
     surf_measure_file = InputMultiPath(File(exists=True), argstr='--is %s...',
                            xor=('surf_measure', 'surf_measure_file', 'surf_area'),
           desc='file alternative to surfmeas, still requires list of subjects')
-    source_format = traits.Unicode(argstr='--srcfmt %s', desc='source format')
-    surf_dir = traits.Unicode(argstr='--surfdir %s',
+    source_format = traits.Str(argstr='--srcfmt %s', desc='source format')
+    surf_dir = traits.Str(argstr='--surfdir %s',
                          desc='alternative directory (instead of surf)')
     vol_measure_file = InputMultiPath(traits.Tuple(File(exists=True),
                                       File(exists=True)),
@@ -114,7 +114,7 @@ def _gen_filename(self, name):
 
 
 class GLMFitInputSpec(FSTraitedSpec):
-    glm_dir = traits.Unicode(argstr='--glmdir %s', desc='save outputs to dir',
+    glm_dir = traits.Str(argstr='--glmdir %s', desc='save outputs to dir',
                          genfile=True)
     in_file = File(desc='input 4D file', argstr='--y %s', mandatory=True,
                   copyfile=False)
@@ -190,12 +190,12 @@ class GLMFitInputSpec(FSTraitedSpec):
     surf = traits.Bool(argstr="--surf %s %s %s",
                        requires=["subject_id", "hemi"],
                        desc="analysis is on a surface mesh")
-    subject_id = traits.Unicode(desc="subject id for surface geometry")
+    subject_id = traits.Str(desc="subject id for surface geometry")
     hemi = traits.Enum("lh", "rh", desc="surface hemisphere")
-    surf_geo = traits.Unicode("white", usedefault=True,
+    surf_geo = traits.Str("white", usedefault=True,
                           desc="surface geometry name (e.g. white, pial)")
     simulation = traits.Tuple(traits.Enum('perm', 'mc-full', 'mc-z'),
-                              traits.Int(min=1), traits.Float, traits.Unicode,
+                              traits.Int(min=1), traits.Float, traits.Str,
                               argstr='--sim %s %d %f %s',
                               desc='nulltype nsim thresh csdbasename')
     sim_sign = traits.Enum('abs', 'pos', 'neg', argstr='--sim-sign %s',
@@ -544,11 +544,11 @@ class SegStatsInputSpec(FSTraitedSpec):
     _xor_inputs = ('segmentation_file', 'annot', 'surf_label')
     segmentation_file = File(exists=True, argstr='--seg %s', xor=_xor_inputs,
                   mandatory=True, desc='segmentation volume path')
-    annot = traits.Tuple(traits.Unicode, traits.Enum('lh', 'rh'), traits.Unicode,
+    annot = traits.Tuple(traits.Str, traits.Enum('lh', 'rh'), traits.Str,
                          argstr='--annot %s %s %s', xor=_xor_inputs,
                          mandatory=True,
                          desc='subject hemi parc : use surface parcellation')
-    surf_label = traits.Tuple(traits.Unicode, traits.Enum('lh', 'rh'), traits.Unicode,
+    surf_label = traits.Tuple(traits.Str, traits.Enum('lh', 'rh'), traits.Str,
                              argstr='--slabel %s %s %s', xor=_xor_inputs,
                              mandatory=True,
                              desc='subject hemi label : use surface label')
@@ -716,11 +716,11 @@ class Label2VolInputSpec(FSTraitedSpec):
                         argstr='--proj %s %f %f %f',
                         requires=('subject_id', 'hemi'),
                         desc='project along surface normal')
-    subject_id = traits.Unicode(argstr='--subject %s',
+    subject_id = traits.Str(argstr='--subject %s',
                            desc='subject id')
     hemi = traits.Enum('lh', 'rh', argstr='--hemi %s',
                        desc='hemisphere to use lh or rh')
-    surface = traits.Unicode(argstr='--surf %s',
+    surface = traits.Str(argstr='--surf %s',
                          desc='use surface instead of white')
     vol_label_file = File(argstr='--o %s', genfile=True,
                           desc='output volume')

nipype/interfaces/fsl/epi.py

@@ -397,7 +397,7 @@ class EddyInputSpec(FSLCommandInputSpec):
     in_bval = File(exists=True, mandatory=True, argstr='--bvals=%s',
                    desc=('File containing the b-values for all volumes in '
                          '--imain'))
-    out_base = traits.Unicode('eddy_corrected', argstr='--out=%s',
+    out_base = traits.Str('eddy_corrected', argstr='--out=%s',
                               usedefault=True,
                               desc=('basename for output (warped) image'))
     session = File(exists=True, argstr='--session=%s',