final fixes

Author: oesteban

nipype/interfaces/base/support.py

@@ -49,7 +49,6 @@ class Bunch(object):
     >>> inputs
     Bunch(fwhm=6.0, infile='subj.nii', register_to_mean=False)
 
-
     Notes
     -----
     The Bunch pattern came from the Python Cookbook:

nipype/interfaces/niftyfit/tests/test_asl.py

@@ -4,15 +4,11 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
 
 from ..asl import FitAsl
-
-
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 
 
 @pytest.mark.skipif(no_nifty_tool(cmd='fit_asl'),

nipype/interfaces/niftyfit/tests/test_dwi.py

@@ -3,15 +3,11 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
 
 from ..dwi import FitDwi, DwiTool
-
-
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 
 
 @pytest.mark.skipif(no_nifty_tool(cmd='fit_dwi'),

nipype/interfaces/niftyfit/tests/test_qt1.py

@@ -4,17 +4,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
-
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from ..qt1 import FitQt1
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='fit_qt1'),
                     reason="niftyfit is not installed")
 def test_fit_qt1():

nipype/interfaces/niftyreg/tests/test_reg.py

@@ -4,13 +4,9 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from .. import (get_custom_path, RegAladin, RegF3D)
-
-
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
+from .test_regutils import no_nifty_tool
 
 
 @pytest.mark.skipif(

nipype/interfaces/niftyseg/tests/test_em_interfaces.py

@@ -3,16 +3,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import EM
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_EM'),
                     reason="niftyseg is not installed")
 def test_seg_em():

nipype/interfaces/niftyseg/tests/test_label_fusion.py

@@ -3,16 +3,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import LabelFusion, CalcTopNCC
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_LabFusion'),
                     reason="niftyseg is not installed")
 def test_seg_lab_fusion():

nipype/interfaces/niftyseg/tests/test_lesions.py

@@ -3,16 +3,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import FillLesions
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_FillLesions'),
                     reason="niftyseg is not installed")
 def test_seg_filllesions():

nipype/interfaces/niftyseg/tests/test_maths.py

@@ -3,18 +3,14 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import (UnaryMaths, BinaryMaths,
                 BinaryMathsInteger, TupleMaths,
                 Merge)
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_maths'),
                     reason="niftyseg is not installed")
 def test_unary_maths():

nipype/interfaces/niftyseg/tests/test_patchmatch.py

@@ -3,16 +3,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import PatchMatch
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_PatchMatch'),
                     reason="niftyseg is not installed")
 def test_seg_patchmatch():

nipype/interfaces/niftyseg/tests/test_stats.py

@@ -3,16 +3,12 @@
 
 import pytest
 
-from ....utils.filemanip import which
 from ....testing import example_data
 from ...niftyreg import get_custom_path
+from ...niftyreg.tests.test_regutils import no_nifty_tool
 from .. import UnaryStats, BinaryStats
 
 
-def no_nifty_tool(cmd=None):
-    return which(cmd) is None
-
-
 @pytest.mark.skipif(no_nifty_tool(cmd='seg_stats'),
                     reason="niftyseg is not installed")
 def test_unary_stats():

nipype/utils/filemanip.py

@@ -684,7 +684,7 @@ def which(cmd, env=None, pathext=None):
     """
 
     if pathext is None:
-        pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
+        pathext = os.getenv('PATHEXT', '').split(os.pathsep)
         pathext.insert(0, '')
 
     path = os.getenv("PATH", os.defpath)