RF: Drop one-line __future__ imports

effigies · effigies · commit 9e47ec05b79f · 2018-07-25T17:14:13.000-04:00
diff --git a/nipype/algorithms/tests/test_modelgen.py b/nipype/algorithms/tests/test_modelgen.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import division
 
 from copy import deepcopy
 import os
diff --git a/nipype/external/fsl_imglob.py b/nipype/external/fsl_imglob.py
@@ -63,7 +63,6 @@
 #   Innovation Limited ("Isis"), the technology transfer company of the
 #   University, to negotiate a licence. Contact details are:
 #   innovation@isis.ox.ac.uk quoting reference DE/9564.
-from __future__ import print_function
 import sys
 import glob
 from builtins import range
diff --git a/nipype/interfaces/ants/tests/test_extra_Registration.py b/nipype/interfaces/ants/tests/test_extra_Registration.py
@@ -1,6 +1,5 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import unicode_literals
 from nipype.interfaces.ants import registration
 import os
 import pytest
diff --git a/nipype/interfaces/cmtk/tests/test_nbs.py b/nipype/interfaces/cmtk/tests/test_nbs.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from ..nbs import NetworkBasedStatistic
 from ....utils.misc import package_check
 import numpy as np
diff --git a/nipype/interfaces/dtitk/base.py b/nipype/interfaces/dtitk/base.py
@@ -25,9 +25,6 @@
 See the docstrings of the individual classes for examples.
 
 """
-from __future__ import print_function, division, unicode_literals, \
-    absolute_import
-
 import os
 
 from ... import logging
diff --git a/nipype/interfaces/elastix/__init__.py b/nipype/interfaces/elastix/__init__.py
@@ -4,7 +4,6 @@
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """Top-level namespace for elastix."""
 
-from __future__ import absolute_import
 
 from .registration import Registration, ApplyWarp, AnalyzeWarp, PointsWarp
 from .utils import EditTransform
diff --git a/nipype/interfaces/freesurfer/tests/test_BBRegister.py b/nipype/interfaces/freesurfer/tests/test_BBRegister.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from ..preprocess import BBRegister, BBRegisterInputSpec6
 
 
diff --git a/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py b/nipype/interfaces/freesurfer/tests/test_FSSurfaceCommand.py
@@ -1,5 +1,4 @@
 # Modified 2017.04.21 by Chris Markiewicz
-from __future__ import unicode_literals
 import pytest
 
 from ..base import FSSurfaceCommand
diff --git a/nipype/interfaces/mrtrix3/__init__.py b/nipype/interfaces/mrtrix3/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 # -*- coding: utf-8 -*-
diff --git a/nipype/interfaces/niftyseg/stats.py b/nipype/interfaces/niftyseg/stats.py
@@ -4,7 +4,6 @@
 The stats module provides higher-level interfaces to some of the operations
 that can be performed with the niftyseg stats (seg_stats) command-line program.
 """
-from __future__ import print_function
 import numpy as np
 
 from ..base import TraitedSpec, File, traits, CommandLineInputSpec
diff --git a/nipype/interfaces/quickshear.py b/nipype/interfaces/quickshear.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 """ Quickshear is a simple geometric defacing algorithm
 """
-from __future__ import unicode_literals
 
 from .base import CommandLineInputSpec, CommandLine, traits, TraitedSpec, File
 from ..external.due import BibTeX
diff --git a/nipype/interfaces/semtools/__init__.py b/nipype/interfaces/semtools/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import *
 from .featurecreator import GenerateCsfClippedFromClassifiedImage
 from .segmentation import *
diff --git a/nipype/interfaces/semtools/brains/__init__.py b/nipype/interfaces/semtools/brains/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .segmentation import SimilarityIndex, BRAINSTalairach, BRAINSTalairachMask
 from .utilities import (HistogramMatchingFilter, GenerateEdgeMapImage,
                         GeneratePurePlugMask)
diff --git a/nipype/interfaces/semtools/diffusion/__init__.py b/nipype/interfaces/semtools/diffusion/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import dtiaverage, dtiestim, dtiprocess, DWIConvert
 from .tractography import *
 from .gtract import (
diff --git a/nipype/interfaces/semtools/diffusion/tractography/__init__.py b/nipype/interfaces/semtools/diffusion/tractography/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .commandlineonly import fiberstats
 from .fiberprocess import fiberprocess
 from .fibertrack import fibertrack
diff --git a/nipype/interfaces/semtools/filtering/__init__.py b/nipype/interfaces/semtools/filtering/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .denoising import UnbiasedNonLocalMeans
 from .featuredetection import (
     GenerateSummedGradientImage, CannySegmentationLevelSetImageFilter,
diff --git a/nipype/interfaces/semtools/legacy/__init__.py b/nipype/interfaces/semtools/legacy/__init__.py
@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .registration import scalartransform
diff --git a/nipype/interfaces/semtools/registration/__init__.py b/nipype/interfaces/semtools/registration/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .specialized import (VBRAINSDemonWarp, BRAINSDemonWarp,
                           BRAINSTransformFromFiducials)
 from .brainsresample import BRAINSResample
diff --git a/nipype/interfaces/semtools/segmentation/__init__.py b/nipype/interfaces/semtools/segmentation/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .specialized import (
     BRAINSCut, BRAINSROIAuto, BRAINSConstellationDetector,
     BRAINSCreateLabelMapFromProbabilityMaps, BinaryMaskEditorBasedOnLandmarks,
diff --git a/nipype/interfaces/semtools/testing/__init__.py b/nipype/interfaces/semtools/testing/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .featuredetection import SphericalCoordinateGeneration
 from .landmarkscompare import LandmarksCompare
 from .generateaveragelmkfile import GenerateAverageLmkFile
diff --git a/nipype/interfaces/semtools/utilities/__init__.py b/nipype/interfaces/semtools/utilities/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .brains import (
     BRAINSConstellationModeler, landmarksConstellationWeights,
     BRAINSTrimForegroundInDirection, BRAINSLmkTransform, BRAINSMush,
diff --git a/nipype/interfaces/slicer/__init__.py b/nipype/interfaces/slicer/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import *
 from .segmentation import *
 from .filtering import *
diff --git a/nipype/interfaces/slicer/diffusion/__init__.py b/nipype/interfaces/slicer/diffusion/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import (
     ResampleDTIVolume, DWIRicianLMMSEFilter, TractographyLabelMapSeeding,
     DWIJointRicianLMMSEFilter, DiffusionWeightedVolumeMasking, DTIimport,
diff --git a/nipype/interfaces/slicer/filtering/__init__.py b/nipype/interfaces/slicer/filtering/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .morphology import (GrayscaleGrindPeakImageFilter,
                          GrayscaleFillHoleImageFilter)
 from .denoising import (GradientAnisotropicDiffusion,
diff --git a/nipype/interfaces/slicer/legacy/__init__.py b/nipype/interfaces/slicer/legacy/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import *
 from .segmentation import OtsuThresholdSegmentation
 from .filtering import OtsuThresholdImageFilter, ResampleScalarVolume
diff --git a/nipype/interfaces/slicer/legacy/diffusion/__init__.py b/nipype/interfaces/slicer/legacy/diffusion/__init__.py
@@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .denoising import DWIUnbiasedNonLocalMeansFilter
diff --git a/nipype/interfaces/slicer/quantification/__init__.py b/nipype/interfaces/slicer/quantification/__init__.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .changequantification import IntensityDifferenceMetric
 from .petstandarduptakevaluecomputation import PETStandardUptakeValueComputation
diff --git a/nipype/interfaces/slicer/registration/__init__.py b/nipype/interfaces/slicer/registration/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .specialized import (ACPCTransform, FiducialRegistration,
                           VBRAINSDemonWarp, BRAINSDemonWarp)
 from .brainsresample import BRAINSResample
diff --git a/nipype/interfaces/slicer/segmentation/__init__.py b/nipype/interfaces/slicer/segmentation/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .specialized import (RobustStatisticsSegmenter, EMSegmentCommandLine,
                           BRAINSROIAuto)
 from .simpleregiongrowingsegmentation import SimpleRegionGrowingSegmentation
diff --git a/nipype/interfaces/utility/tests/test_base.py b/nipype/interfaces/utility/tests/test_base.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import print_function, unicode_literals
 import os
 import pytest
 
diff --git a/nipype/interfaces/utility/tests/test_csv.py b/nipype/interfaces/utility/tests/test_csv.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import print_function, unicode_literals
 
 from nipype.interfaces import utility
 
diff --git a/nipype/interfaces/utility/tests/test_wrappers.py b/nipype/interfaces/utility/tests/test_wrappers.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import print_function, unicode_literals
 import os
 import pytest
 
diff --git a/nipype/pipeline/engine/__init__.py b/nipype/pipeline/engine/__init__.py
@@ -7,7 +7,6 @@
 
 """
 
-from __future__ import absolute_import
 __docformat__ = 'restructuredtext'
 from .workflows import Workflow
 from .nodes import Node, MapNode, JoinNode
diff --git a/nipype/pipeline/engine/tests/test_base.py b/nipype/pipeline/engine/tests/test_base.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import print_function, unicode_literals
 
 import pytest
 from ..base import EngineBase
diff --git a/nipype/utils/__init__.py b/nipype/utils/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 
 from .config import NUMPY_MMAP
 from .onetime import OneTimeProperty, setattr_on_read
diff --git a/nipype/workflows/dmri/camino/__init__.py b/nipype/workflows/dmri/camino/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import create_camino_dti_pipeline
 from .connectivity_mapping import create_connectivity_pipeline
 from .group_connectivity import create_group_connectivity_pipeline
diff --git a/nipype/workflows/dmri/connectivity/__init__.py b/nipype/workflows/dmri/connectivity/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .nx import (create_networkx_pipeline, create_cmats_to_csv_pipeline)
 from .group_connectivity import (
     create_merge_networks_by_group_workflow,
diff --git a/nipype/workflows/dmri/dipy/__init__.py b/nipype/workflows/dmri/dipy/__init__.py
@@ -3,5 +3,4 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 
-from __future__ import absolute_import
 from .denoise import nlmeans_pipeline
diff --git a/nipype/workflows/dmri/dtitk/__init__.py b/nipype/workflows/dmri/dtitk/__init__.py
@@ -3,6 +3,5 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 
-from __future__ import absolute_import
 from .tensor_registration import (affine_tensor_pipeline,
                                   diffeomorphic_tensor_pipeline)
diff --git a/nipype/workflows/dmri/fsl/__init__.py b/nipype/workflows/dmri/fsl/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .dti import create_bedpostx_pipeline, bedpostx_parallel
 
 from .artifacts import (all_fmb_pipeline, all_peb_pipeline, all_fsl_pipeline,
diff --git a/nipype/workflows/dmri/fsl/dti.py b/nipype/workflows/dmri/fsl/dti.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # coding: utf-8
 
-from __future__ import absolute_import
 
 from ....pipeline import engine as pe
 from ....interfaces import utility as niu
diff --git a/nipype/workflows/dmri/fsl/tests/test_dti.py b/nipype/workflows/dmri/fsl/tests/test_dti.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function, absolute_import
 import os
 
 import pytest
diff --git a/nipype/workflows/dmri/mrtrix/__init__.py b/nipype/workflows/dmri/mrtrix/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 from .diffusion import create_mrtrix_dti_pipeline
 from .connectivity_mapping import create_connectivity_pipeline
 from .group_connectivity import (create_group_connectivity_pipeline)
diff --git a/nipype/workflows/fmri/fsl/preprocess.py b/nipype/workflows/fmri/fsl/preprocess.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-from __future__ import division
 
 import os
 from ....interfaces import fsl as fsl  # fsl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`	`1`	`from ..nbs import NetworkBasedStatistic`
`3`	`2`	`from ....utils.misc import package_check`
`4`	`3`	`import numpy as np`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import unicode_literals`
`2`	`1`	`from ..preprocess import BBRegister, BBRegisterInputSpec6`
`3`	`2`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# Modified 2017.04.21 by Chris Markiewicz`
`2`		`-from __future__ import unicode_literals`
`3`	`2`	`import pytest`
`4`	`3`
`5`	`4`	`from ..base import FSSurfaceCommand`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import absolute_import`
`2`	`1`	`# emacs: -- mode: python; py-indent-offset: 4; indent-tabs-mode: nil --`
`3`	`2`	`# vi: set ft=python sts=4 ts=4 sw=4 et:`
`4`	`3`	`# -- coding: utf-8 --`