Merge pull request #2413 from nipy/revert-2412-fix/master

Revert "[FIX,WIP] Setting inputs.ignore_exception"

Author: satra

doc/users/saving_workflows.rst

@@ -73,27 +73,27 @@ This will create a file "outputtestsave.py" with the following content:
 	    return out
 
 	testfunc.inputs.function_str = getsource(testfunc_1)
-	testfunc.ignore_exception = False
+	testfunc.inputs.ignore_exception = False
 	testfunc.inputs.in1 = '-sub'
 	testsave.connect(inode, "a", testfunc, "in1")
 	# Node: testsave.bet2
 	bet2 = MapNode(BET(), iterfield=['infile'], name="bet2")
 	bet2.iterables = ('frac', [0.4, 0.5])
-	bet2.interface.ignore_exception = False
 	bet2.inputs.environ = {'FSLOUTPUTTYPE': 'NIFTI_GZ'}
+	bet2.inputs.ignore_exception = False
 	bet2.inputs.output_type = 'NIFTI_GZ'
 	bet2.terminal_output = 'stream'
 	# Node: testsave.bet
 	bet = Node(BET(), name="bet")
 	bet.iterables = ('frac', [0.3, 0.4])
-	bet.interface.ignore_exception = False
 	bet.inputs.environ = {'FSLOUTPUTTYPE': 'NIFTI_GZ'}
+	bet.inputs.ignore_exception = False
 	bet.inputs.output_type = 'NIFTI_GZ'
 	bet.terminal_output = 'stream'
 	# Node: testsave.maths
 	maths = Node(ImageMaths(), name="maths")
-	maths.interface.ignore_exception = False
 	maths.inputs.environ = {'FSLOUTPUTTYPE': 'NIFTI_GZ'}
+	maths.inputs.ignore_exception = False
 	maths.inputs.output_type = 'NIFTI_GZ'
 	maths.terminal_output = 'stream'
 	testsave.connect(bet2, ('mask_file', func), maths, "in_file2")

nipype/workflows/smri/ants/ANTSBuildTemplate.py

@@ -183,7 +183,7 @@ def ANTSTemplateBuildSingleIterationWF(iterationPhasePrefix=''):
             output_names=['out']),
         run_without_submitting=True,
         name='MakeTransformsLists')
-    MakeTransformsLists.interface.ignore_exception = True
+    MakeTransformsLists.inputs.ignore_exception = True
     TemplateBuildSingleIterationWF.connect(
         BeginANTS, 'warp_transform', MakeTransformsLists, 'warpTransformList')
     TemplateBuildSingleIterationWF.connect(BeginANTS, 'affine_transform',
@@ -263,7 +263,7 @@ def ANTSTemplateBuildSingleIterationWF(iterationPhasePrefix=''):
             output_names=['TransformListWithGradientWarps']),
         run_without_submitting=True,
         name='MakeTransformListWithGradientWarps')
-    ApplyInvAverageAndFourTimesGradientStepWarpImage.interface.ignore_exception = True
+    ApplyInvAverageAndFourTimesGradientStepWarpImage.inputs.ignore_exception = True
 
     TemplateBuildSingleIterationWF.connect(
         AvgAffineTransform, 'affine_transform',

nipype/workflows/smri/ants/antsRegistrationBuildTemplate.py

@@ -360,7 +360,7 @@ def antsRegistrationTemplateBuildSingleIterationWF(iterationPhasePrefix=''):
             output_names=['TransformListWithGradientWarps']),
         run_without_submitting=True,
         name='99_MakeTransformListWithGradientWarps')
-    ApplyInvAverageAndFourTimesGradientStepWarpImage.interface.ignore_exception = True
+    ApplyInvAverageAndFourTimesGradientStepWarpImage.inputs.ignore_exception = True
 
     TemplateBuildSingleIterationWF.connect(
         AvgAffineTransform, 'affine_transform',