RF: Drop six.*_types

Author: effigies

nibabel/brikhead.py

@@ -33,7 +33,6 @@
 import re
 
 import numpy as np
-from six import string_types
 
 from .arrayproxy import ArrayProxy
 from .fileslice import strided_scalar
@@ -203,7 +202,7 @@ def parse_AFNI_header(fobj):
     [1, 1, 1]
     """
     # edge case for being fed a filename instead of a file object
-    if isinstance(fobj, string_types):
+    if isinstance(fobj, str):
         with open(fobj, 'rt') as src:
             return parse_AFNI_header(src)
     # unpack variables in HEAD file

nibabel/cifti2/cifti2_axes.py

@@ -120,7 +120,6 @@
 """
 import numpy as np
 from . import cifti2
-from six import string_types, integer_types
 from operator import xor
 import abc
 
@@ -288,7 +287,7 @@ def __init__(self, name, voxel=None, vertex=None, affine=None,
         else:
             self.vertex = np.asanyarray(vertex, dtype=int)
 
-        if isinstance(name, string_types):
+        if isinstance(name, str):
             name = [self.to_cifti_brain_structure_name(name)] * self.vertex.size
         self.name = np.asanyarray(name, dtype='U')
 
@@ -504,7 +503,7 @@ def to_cifti_brain_structure_name(name):
         """
         if name in cifti2.CIFTI_BRAIN_STRUCTURES:
             return name
-        if not isinstance(name, string_types):
+        if not isinstance(name, str):
             if len(name) == 1:
                 structure = name[0]
                 orientation = 'both'
@@ -588,7 +587,7 @@ def volume_shape(self, value):
             value = tuple(value)
             if len(value) != 3:
                 raise ValueError("Volume shape should be a tuple of length 3")
-            if not all(isinstance(v, integer_types) for v in value):
+            if not all(isinstance(v, int) for v in value):
                 raise ValueError("All elements of the volume shape should be integers")
         self._volume_shape = value
 
@@ -678,9 +677,9 @@ def __getitem__(self, item):
 
         Otherwise returns a new BrainModelAxis
         """
-        if isinstance(item, integer_types):
+        if isinstance(item, int):
             return self.get_element(item)
-        if isinstance(item, string_types):
+        if isinstance(item, str):
             raise IndexError("Can not index an Axis with a string (except for ParcelsAxis)")
         return self.__class__(self.name[item], self.voxel[item], self.vertex[item],
                               self.affine, self.volume_shape, self.nvertices)
@@ -913,7 +912,7 @@ def volume_shape(self, value):
             value = tuple(value)
             if len(value) != 3:
                 raise ValueError("Volume shape should be a tuple of length 3")
-            if not all(isinstance(v, integer_types) for v in value):
+            if not all(isinstance(v, int) for v in value):
                 raise ValueError("All elements of the volume shape should be integers")
         self._volume_shape = value
 
@@ -988,14 +987,14 @@ def __getitem__(self, item):
         - `string`: 2-element tuple of (parcel voxels, parcel vertices
         - other object that can index 1D arrays: new Parcel axis
         """
-        if isinstance(item, string_types):
+        if isinstance(item, str):
             idx = np.where(self.name == item)[0]
             if len(idx) == 0:
                 raise IndexError("Parcel %s not found" % item)
             if len(idx) > 1:
                 raise IndexError("Multiple parcels with name %s found" % item)
             return self.voxels[idx[0]], self.vertices[idx[0]]
-        if isinstance(item, integer_types):
+        if isinstance(item, int):
             return self.get_element(item)
         return self.__class__(self.name[item], self.voxels[item], self.vertices[item],
                               self.affine, self.volume_shape, self.nvertices)
@@ -1124,7 +1123,7 @@ def __add__(self, other):
         )
 
     def __getitem__(self, item):
-        if isinstance(item, integer_types):
+        if isinstance(item, int):
             return self.get_element(item)
         return self.__class__(self.name[item], self.meta[item])
 
@@ -1269,7 +1268,7 @@ def __add__(self, other):
         )
 
     def __getitem__(self, item):
-        if isinstance(item, integer_types):
+        if isinstance(item, int):
             return self.get_element(item)
         return self.__class__(self.name[item], self.label[item], self.meta[item])
 
@@ -1436,7 +1435,7 @@ def __getitem__(self, item):
                 nelements = 0
             return SeriesAxis(idx_start * self.step + self.start, self.step * step,
                               nelements, self.unit)
-        elif isinstance(item, integer_types):
+        elif isinstance(item, int):
             return self.get_element(item)
         raise IndexError('SeriesAxis can only be indexed with integers or slices '
                          'without breaking the regular structure')

nibabel/externals/netcdf.py

@@ -40,8 +40,6 @@
 from numpy import little_endian as LITTLE_ENDIAN
 from functools import reduce
 
-from six import integer_types
-
 
 ABSENT = b'\x00\x00\x00\x00\x00\x00\x00\x00'
 ZERO = b'\x00\x00\x00\x00'
@@ -479,8 +477,8 @@ def _write_values(self, values):
         if hasattr(values, 'dtype'):
             nc_type = REVERSE[values.dtype.char, values.dtype.itemsize]
         else:
-            types = [(t, NC_INT) for t in integer_types]
-            types += [
+            types = [
+                    (int, NC_INT),
                     (float, NC_FLOAT),
                     (str, NC_CHAR),
                     ]

nibabel/filebasedimages.py

@@ -10,7 +10,6 @@
 
 import io
 from copy import deepcopy
-from six import string_types
 from .fileholders import FileHolder
 from .filename_parser import (types_filenames, TypesFilenamesError,
                               splitext_addext)
@@ -374,7 +373,7 @@ def make_file_map(klass, mapping=None):
         for key, ext in klass.files_types:
             file_map[key] = FileHolder()
             mapval = mapping.get(key, None)
-            if isinstance(mapval, string_types):
+            if isinstance(mapval, str):
                 file_map[key].filename = mapval
             elif hasattr(mapval, 'tell'):
                 file_map[key].fileobj = mapval

nibabel/gifti/tests/test_gifti.py

@@ -7,7 +7,6 @@
 import numpy as np
 
 import nibabel as nib
-from six import string_types
 from nibabel.gifti import (GiftiImage, GiftiDataArray, GiftiLabel,
                            GiftiLabelTable, GiftiMetaData, GiftiNVPairs,
                            GiftiCoordSystem)
@@ -176,11 +175,11 @@ def test_to_xml_open_close_deprecations():
     da = GiftiDataArray(np.ones((1,)), 'triangle')
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('always', category=DeprecationWarning)
-        assert_true(isinstance(da.to_xml_open(), string_types))
+        assert_true(isinstance(da.to_xml_open(), str))
         assert_equal(len(w), 1)
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('once', category=DeprecationWarning)
-        assert_true(isinstance(da.to_xml_close(), string_types))
+        assert_true(isinstance(da.to_xml_close(), str))
         assert_equal(len(w), 1)
 
 

nibabel/nifti1.py

@@ -12,7 +12,6 @@
 '''
 import warnings
 from io import BytesIO
-from six import string_types
 
 import numpy as np
 import numpy.linalg as npl
@@ -1389,7 +1388,7 @@ def set_intent(self, code, params=(), name='', allow_unknown=False):
         if not known_intent:
             # We can set intent via an unknown integer code, but can't via an
             # unknown string label
-            if not allow_unknown or isinstance(code, string_types):
+            if not allow_unknown or isinstance(code, str):
                 raise KeyError('Unknown intent code: ' + str(code))
         if known_intent:
             icode = intent_codes.code[code]

nibabel/optpkg.py

@@ -1,7 +1,6 @@
 """ Routines to support optional packages """
 import pkgutil
 from distutils.version import LooseVersion
-from six import string_types
 from .tripwire import TripWire
 
 if pkgutil.find_loader('nose'):
@@ -12,7 +11,7 @@
 
 def _check_pkg_version(pkg, min_version):
     # Default version checking function
-    if isinstance(min_version, string_types):
+    if isinstance(min_version, str):
         min_version = LooseVersion(min_version)
     try:
         return min_version <= pkg.__version__

nibabel/streamlines/__init__.py

@@ -2,7 +2,6 @@
 """
 import os
 import warnings
-from six import string_types
 
 from .header import Field
 from .array_sequence import ArraySequence
@@ -57,7 +56,7 @@ def detect_format(fileobj):
         except IOError:
             pass
 
-    if isinstance(fileobj, string_types):
+    if isinstance(fileobj, str):
         _, ext = os.path.splitext(fileobj)
         return FORMATS.get(ext.lower())
 

nibabel/tests/test_image_api.py

@@ -27,7 +27,6 @@
 import warnings
 from functools import partial
 from itertools import product
-from six import string_types
 
 import numpy as np
 
@@ -577,7 +576,7 @@ def validate_path_maybe_image(self, imaker, params):
             assert_true(isinstance(test, bool))
             if sniff is not None:
                 assert isinstance(sniff[0], bytes)
-                assert isinstance(sniff[1], string_types)
+                assert isinstance(sniff[1], str)
 
 
 class MakeImageAPI(LoadImageAPI):

nibabel/tests/test_nifti1.py

@@ -11,8 +11,6 @@
 import warnings
 import struct
 
-import six
-
 import numpy as np
 
 from nibabel import nifti1 as nifti1
@@ -942,16 +940,16 @@ def test_set_sform(self):
     def test_sqform_code_type(self):
         # make sure get_s/qform returns codes as integers
         img = self.image_class(np.zeros((2, 3, 4)), None)
-        assert isinstance(img.get_sform(coded=True)[1], six.integer_types)
-        assert isinstance(img.get_qform(coded=True)[1], six.integer_types)
+        assert isinstance(img.get_sform(coded=True)[1], int)
+        assert isinstance(img.get_qform(coded=True)[1], int)
         img.set_sform(None, 3)
         img.set_qform(None, 3)
-        assert isinstance(img.get_sform(coded=True)[1], six.integer_types)
-        assert isinstance(img.get_qform(coded=True)[1], six.integer_types)
+        assert isinstance(img.get_sform(coded=True)[1], int)
+        assert isinstance(img.get_qform(coded=True)[1], int)
         img.set_sform(None, 2.0)
         img.set_qform(None, 4.0)
-        assert isinstance(img.get_sform(coded=True)[1], six.integer_types)
-        assert isinstance(img.get_qform(coded=True)[1], six.integer_types)
+        assert isinstance(img.get_sform(coded=True)[1], int)
+        assert isinstance(img.get_qform(coded=True)[1], int)
         img.set_sform(None, img.get_sform(coded=True)[1])
         img.set_qform(None, img.get_qform(coded=True)[1])
 

nibabel/tests/test_proxy_api.py

@@ -35,7 +35,6 @@
 
 import numpy as np
 
-from six import string_types
 from ..volumeutils import apply_read_scaling
 from ..analyze import AnalyzeHeader
 from ..spm99analyze import Spm99AnalyzeHeader
@@ -152,7 +151,7 @@ def validate_header_isolated(self, pmaker, params):
     def validate_fileobj_isolated(self, pmaker, params):
         # Check file position of read independent of file-like object
         prox, fio, hdr = pmaker()
-        if isinstance(fio, string_types):
+        if isinstance(fio, str):
             return
         assert_array_equal(prox, params['arr_out'])
         fio.read()  # move to end of file