Merge pull request #1713 from shoshber/consistentxfm

FIX: Make XFM capitalization consistent

Author: Shoshana Berleant

nipype/interfaces/fsl/preprocess.py

@@ -563,27 +563,26 @@ def _parse_inputs(self, skip=None):
         skip.append('save_log')
         return super(FLIRT, self)._parse_inputs(skip=skip)
 
-
-class ApplyXfmInputSpec(FLIRTInputSpec):
+class ApplyXFMInputSpec(FLIRTInputSpec):
     apply_xfm = traits.Bool(
         True, argstr='-applyxfm', requires=['in_matrix_file'],
         desc='apply transformation supplied by in_matrix_file',
         usedefault=True)
 
 
-class ApplyXfm(FLIRT):
+class ApplyXFM(FLIRT):
     """Currently just a light wrapper around FLIRT,
     with no modifications
 
-    ApplyXfm is used to apply an existing tranform to an image
+    ApplyXFM is used to apply an existing tranform to an image
 
 
     Examples
     --------
 
     >>> import nipype.interfaces.fsl as fsl
     >>> from nipype.testing import example_data
-    >>> applyxfm = fsl.ApplyXfm()
+    >>> applyxfm = fsl.preprocess.ApplyXFM()
     >>> applyxfm.inputs.in_file = example_data('structural.nii')
     >>> applyxfm.inputs.in_matrix_file = example_data('trans.mat')
     >>> applyxfm.inputs.out_file = 'newfile.nii'
@@ -592,8 +591,18 @@ class ApplyXfm(FLIRT):
     >>> result = applyxfm.run() # doctest: +SKIP
 
     """
-    input_spec = ApplyXfmInputSpec
+    input_spec = ApplyXFMInputSpec
 
+class ApplyXfm(ApplyXFM):
+    """
+    .. deprecated:: 0.12.1
+       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)
 
 class MCFLIRTInputSpec(FSLCommandInputSpec):
     in_file = File(exists=True, position=0, argstr="-in %s", mandatory=True,