RF: Purge six

Author: effigies

COPYING

@@ -218,34 +218,3 @@ the PDDL version 1.0 available at http://opendatacommons.org/licenses/pddl/1.0/
 
 is courtesy of the University of Massachusetts Medical School, also released
 under the PDDL.
-
-
-Six
---------------------
-
-In ``nibabel/externals/six.py``
-
-Copied from: https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz#md5=ec47fe6070a8a64c802363d2c2b1e2ee
-
-::
-
-    Copyright (c) 2010-2013 Benjamin Peterson
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of
-    this software and associated documentation files (the "Software"), to deal in
-    the Software without restriction, including without limitation the rights to
-    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-    the Software, and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-

nibabel/affines.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from six.moves import reduce
+from functools import reduce
 
 
 class AffineError(ValueError):

nibabel/benchmarks/bench_streamlines.py

@@ -17,7 +17,6 @@
 
 import numpy as np
 
-from six.moves import zip
 from nibabel.tmpdirs import InTemporaryDirectory
 
 from numpy.testing import assert_array_equal

nibabel/brikhead.py

@@ -34,7 +34,6 @@
 import re
 
 import numpy as np
-from six import string_types
 
 from .arrayproxy import ArrayProxy
 from .fileslice import strided_scalar
@@ -204,7 +203,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, add_metaclass, integer_types
 from operator import xor
 import abc
 
@@ -173,8 +172,7 @@ def to_header(axes):
     return cifti2.Cifti2Header(matrix)
 
 
-@add_metaclass(abc.ABCMeta)
-class Axis(object):
+class Axis(object, metaclass=abc.ABCMeta):
     """
     Abstract class for any object describing the rows or columns of a CIFTI-2 vector/matrix
 
@@ -289,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')
 
@@ -505,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'
@@ -589,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
 
@@ -679,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)
@@ -914,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
 
@@ -989,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)
@@ -1125,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])
 
@@ -1270,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])
 
@@ -1437,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/cmdline/tests/test_utils.py

@@ -15,7 +15,7 @@
 from os.path import (join as pjoin)
 from nibabel.testing import data_path
 from collections import OrderedDict
-from six import StringIO
+from io import StringIO
 
 
 def test_table2string():

nibabel/data.py

@@ -8,7 +8,7 @@
 from os.path import join as pjoin
 import glob
 import sys
-from six.moves import configparser
+import configparser
 from distutils.version import LooseVersion
 
 from .environment import get_nipy_user_dir, get_nipy_system_dir

nibabel/eulerangles.py

@@ -85,7 +85,7 @@
 
 import math
 
-from six.moves import reduce
+from functools import reduce
 
 import numpy as np
 

nibabel/externals/__init__.py

@@ -1,5 +0,0 @@
-# init for externals package
-from collections import OrderedDict
-
-from ..deprecated import ModuleProxy as _ModuleProxy
-six = _ModuleProxy('nibabel.externals.six')

nibabel/externals/netcdf.py

@@ -41,8 +41,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'
@@ -480,8 +478,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),
                     ]