Merge pull request #1726 from shoshber/duh

FIX bug

Author: Shoshana Berleant

nipype/interfaces/fsl/preprocess.py

@@ -600,10 +600,10 @@ class ApplyXfm(ApplyXFM):
        Use :py:class:`nipype.interfaces.fsl.ApplyXFM` instead
     """
     def __init__(self, **inputs):
-        super(confounds.TSNR, self).__init__(**inputs)
-        warnings.warn(("This interface has been renamed since 0.12.1,"
-                       " please use nipype.interfaces.fsl.ApplyXFM"),
-                      UserWarning)
+        super(ApplyXfm, self).__init__(**inputs)
+        warn(('This interface has been renamed since 0.12.1, please use '
+              'nipype.interfaces.fsl.ApplyXFM'),
+             UserWarning)
 
 class MCFLIRTInputSpec(FSLCommandInputSpec):
     in_file = File(exists=True, position=0, argstr="-in %s", mandatory=True,

nipype/interfaces/fsl/tests/test_preprocess.py

@@ -10,7 +10,7 @@
 import shutil
 
 from nipype.testing import (assert_equal, assert_not_equal, assert_raises,
-                            skipif)
+                            skipif, assert_true)
 
 from nipype.utils.filemanip import split_filename, filename_to_list
 from .. import preprocess as fsl
@@ -614,3 +614,8 @@ def test_first_genfname():
     value = first._gen_fname(name='original_segmentations')
     expected_value = os.path.abspath('segment_all_none_origsegs.nii.gz')
     yield assert_equal, value, expected_value
+
+@skipif(no_fsl)
+def test_deprecation():
+    interface = fsl.ApplyXfm()
+    yield assert_true, isinstance(interface, fsl.ApplyXFM)