merge oscars fixes + fix the sloppy merge

Author: chrisgorgo

nipype/algorithms/tests/test_auto_ErrorMap.py

@@ -23,9 +23,6 @@
     package_check('dipy', version='0.6.0')
 except Exception as e:
     have_dipy = False
-else:
-    from dipy.align.aniso2iso import resample
-    from dipy.core.gradients import GradientTable
 
 
 class ResampleInputSpec(TraitedSpec):
@@ -172,6 +169,7 @@ def resample_proxy(in_file, order=3, new_zooms=None, out_file=None):
     """
     Performs regridding of an image to set isotropic voxel sizes using dipy.
     """
+    from dipy.align.aniso2iso import resample
 
     if out_file is None:
         fname, fext = op.splitext(op.basename(in_file))

nipype/algorithms/tests/test_auto_Overlap.py

@@ -16,6 +16,7 @@ def test_Surface2VolTransform_inputs():
     usedefault=True,
     ),
     mkmask=dict(argstr='--mkmask',
+    xor=['source_file'],
     ),
     projfrac=dict(argstr='--projfrac %s',
     ),
@@ -26,6 +27,7 @@ def test_Surface2VolTransform_inputs():
     source_file=dict(argstr='--surfval %s',
     copyfile=False,
     mandatory=True,
+    xor=['mkmask'],
     ),
     subject_id=dict(argstr='--identity %s',
     xor=['reg_file'],

nipype/interfaces/dipy/preprocess.py

@@ -72,75 +72,6 @@
 from .base import EngineBase
 
 
-def _write_inputs(node):
-    lines = []
-    nodename = node.fullname.replace('.', '_')
-    for key, _ in node.inputs.items():
-        val = getattr(node.inputs, key)
-        if isdefined(val):
-            if type(val) == str:
-                try:
-                    func = create_function_from_source(val)
-                except RuntimeError:
-                    lines.append("%s.inputs.%s = '%s'" % (nodename, key, val))
-                else:
-                    funcname = [name for name in func.func_globals
-                                if name != '__builtins__'][0]
-                    lines.append(cPickle.loads(val))
-                    if funcname == nodename:
-                        lines[-1] = lines[-1].replace(' %s(' % funcname,
-                                                      ' %s_1(' % funcname)
-                        funcname = '%s_1' % funcname
-                    lines.append('from nipype.utils.misc import getsource')
-                    lines.append("%s.inputs.%s = getsource(%s)" % (nodename,
-                                                                   key,
-                                                                   funcname))
-            else:
-                lines.append('%s.inputs.%s = %s' % (nodename, key, val))
-    return lines
-
-
-def format_node(node, format='python', include_config=False):
-    """Format a node in a given output syntax."""
-    lines = []
-    name = node.fullname.replace('.', '_')
-    if format == 'python':
-        klass = node._interface
-        importline = 'from %s import %s' % (klass.__module__,
-                                            klass.__class__.__name__)
-        comment = '# Node: %s' % node.fullname
-        spec = inspect.getargspec(node._interface.__init__)
-        args = spec.args[1:]
-        if args:
-            filled_args = []
-            for arg in args:
-                if  hasattr(node._interface, '_%s' % arg):
-                    filled_args.append('%s=%s' % (arg, getattr(node._interface,
-                                                               '_%s' % arg)))
-            args = ', '.join(filled_args)
-        else:
-            args = ''
-        klass_name = klass.__class__.__name__
-        if isinstance(node, MapNode):
-            nodedef = '%s = MapNode(%s(%s), iterfield=%s, name="%s")' \
-                      % (name, klass_name, args, node.iterfield, name)
-        else:
-            nodedef = '%s = Node(%s(%s), name="%s")' \
-                      % (name, klass_name, args, name)
-        lines = [importline, comment, nodedef]
-
-        if include_config:
-            lines = [importline, "from collections import OrderedDict",
-                     comment, nodedef]
-            lines.append('%s.config = %s' % (name, node.config))
-
-        if node.iterables is not None:
-            lines.append('%s.iterables = %s' % (name, node.iterables))
-        lines.extend(_write_inputs(node))
-
-    return lines
-
-
 class WorkflowBase(object):
     """Defines common attributes and functions for workflows and nodes."""