RF: Remove Python < 3.5 hacks

Author: effigies

nibabel/dft.py

@@ -277,9 +277,7 @@ def __exit__(self, type, value, traceback):
 
 def _get_subdirs(base_dir, files_dict=None, followlinks=False):
     dirs = []
-    # followlinks keyword not available for python 2.5.
-    kwargs = {} if not followlinks else {'followlinks': True}
-    for (dirpath, dirnames, filenames) in os.walk(base_dir, **kwargs):
+    for (dirpath, dirnames, filenames) in os.walk(base_dir, followlinks=followlinks):
         abs_dir = os.path.realpath(dirpath)
         if abs_dir in dirs:
             raise CachingError('link cycle detected under %s' % base_dir)

nibabel/nicom/tests/test_csareader.py

@@ -130,8 +130,6 @@ def test_ice_dims():
 
 
 @dicom_test
-@skipif(sys.version_info < (2,7) and pydicom.__version__ < '1.0',
-        'Known issue for python 2.6 and pydicom < 1.0')
 def test_missing_csa_elem():
     # Test that we get None instead of raising an Exception when the file has
     # the PrivateCreator element for the CSA dict but not the element with the

nibabel/tests/scriptrunner.py

@@ -18,22 +18,8 @@
 
 from subprocess import Popen, PIPE
 
-try:  # Python 2
-    string_types = basestring,
-except NameError:  # Python 3
-    string_types = str,
 
-
-def _get_package():
-    """ Workaround for missing ``__package__`` in Python 3.2
-    """
-    if '__package__' in globals() and not __package__ is None:
-        return __package__
-    return __name__.split('.', 1)[0]
-
-
-# Same as __package__ for Python 2.6, 2.7 and >= 3.3
-MY_PACKAGE = _get_package()
+MY_PACKAGE = __package__
 
 
 def local_script_dir(script_sdir):
@@ -117,7 +103,7 @@ def run_command(self, cmd, check_code=True):
         stderr : bytes
             stderr from `cmd`
         """
-        if isinstance(cmd, string_types):
+        if isinstance(cmd, str):
             cmd = [cmd]
         else:
             cmd = list(cmd)

nibabel/tests/test_arraywriters.py

@@ -3,9 +3,7 @@
 See docstring of :mod:`nibabel.arraywriters` for API.
 """
 
-import sys
 from platform import python_compiler, machine
-from distutils.version import LooseVersion
 import itertools
 import numpy as np
 
@@ -33,8 +31,6 @@
 IUINT_TYPES = INT_TYPES + UINT_TYPES
 NUMERIC_TYPES = CFLOAT_TYPES + IUINT_TYPES
 
-NP_VERSION = LooseVersion(np.__version__)
-
 
 def round_trip(writer, order='F', apply_scale=True):
     sio = BytesIO()
@@ -65,29 +61,14 @@ def test_arraywriters():
             assert_array_equal(arr, round_trip(aw))
             # Byteswapped should be OK
             bs_arr = arr.byteswap().newbyteorder('S')
-            # Except on some numpies for complex256, where the array does not
-            # equal itself
-            if not np.all(bs_arr == arr):
-                assert_true(NP_VERSION <= LooseVersion('1.7.0'))
-                assert_true(on_powerpc())
-                assert_true(type == np.complex256)
-            else:
-                bs_aw = klass(bs_arr)
-                bs_aw_rt = round_trip(bs_aw)
-                # On Ubuntu 13.04 with python 3.3 __eq__ comparison on
-                # arrays with complex numbers fails here for some
-                # reason -- not our fault, and to test correct operation we
-                # will just compare element by element
-                if NP_VERSION == '1.7.1' and sys.version_info[:2] == (3, 3):
-                    assert_array_equal_ = lambda x, y: np.all([x_ == y_ for x_, y_ in zip(x, y)])
-                else:
-                    assert_array_equal_ = assert_array_equal
-                # assert against original array because POWER7 was running into
-                # trouble using the byteswapped array (bs_arr)
-                assert_array_equal_(arr, bs_aw_rt)
-                bs_aw2 = klass(bs_arr, arr.dtype)
-                bs_aw2_rt = round_trip(bs_aw2)
-                assert_array_equal(arr, bs_aw2_rt)
+            bs_aw = klass(bs_arr)
+            bs_aw_rt = round_trip(bs_aw)
+            # assert against original array because POWER7 was running into
+            # trouble using the byteswapped array (bs_arr)
+            assert_array_equal(arr, bs_aw_rt)
+            bs_aw2 = klass(bs_arr, arr.dtype)
+            bs_aw2_rt = round_trip(bs_aw2)
+            assert_array_equal(arr, bs_aw2_rt)
             # 2D array
             arr2 = np.reshape(arr, (2, 5))
             a2w = klass(arr2)

nibabel/tests/test_rstutils.py

@@ -1,22 +1,17 @@
 """ Test printable table
 """
 
-import sys
 import numpy as np
 
 from ..rstutils import rst_table
 
-from nose import SkipTest
 from nose.tools import assert_equal, assert_raises
 
 
 def test_rst_table():
     # Tests for printable table function
     R, C = 3, 4
     cell_values = np.arange(R * C).reshape((R, C))
-    if (sys.version_info[:3] == (3, 2, 3) and np.__version__ == '1.6.1'):
-        raise SkipTest("Known (later fixed) bug in python3.2/numpy "
-                       "treating np.int64 as str")
     assert_equal(rst_table(cell_values),
                  """+--------+--------+--------+--------+--------+
 |        | col[0] | col[1] | col[2] | col[3] |

nibabel/trackvis.py

@@ -18,11 +18,6 @@
 from .affines import apply_affine
 from .deprecated import deprecate_with_version
 
-try:
-    basestring
-except NameError:  # python 3
-    basestring = str
-
 warnings.warn("The trackvis interface has been deprecated and will be removed "
               "in v4.0; please use the 'nibabel.streamlines' interface.",
               DeprecationWarning,
@@ -831,15 +826,13 @@ def __init__(self,
     @classmethod
     def from_file(klass, file_like, points_space=None):
         streamlines, header = read(file_like, points_space=points_space)
-        filename = (file_like if isinstance(file_like, basestring)
-                    else None)
+        filename = file_like if isinstance(file_like, str) else None
         return klass(streamlines, header, None, filename, points_space)
 
     def to_file(self, file_like):
         write(file_like, self.streamlines, self.header, self.endianness,
               points_space=self.points_space)
-        self.filename = (file_like if isinstance(file_like, basestring)
-                         else None)
+        self.filename = file_like if isinstance(file_like, str) else None
 
     def get_affine(self, atleast_v2=True):
         """ Get affine from header in object