RF: remove use of six.py

matthew-brett · matthew-brett · commit e395f54cecab · 2017-02-12T16:42:57.000Z
No longer use routines from six.py - extend py3k module ot add missing
compatibility.
diff --git a/nibabel/affines.py b/nibabel/affines.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from six.moves import reduce
+from functools import reduce
 
 
 class AffineError(ValueError):
diff --git a/nibabel/benchmarks/bench_streamlines.py b/nibabel/benchmarks/bench_streamlines.py
@@ -17,7 +17,7 @@
 
 import numpy as np
 
-from six.moves import zip
+from nibabel.py3k import zip
 from nibabel.tmpdirs import InTemporaryDirectory
 
 from numpy.testing import assert_array_equal
diff --git a/nibabel/data.py b/nibabel/data.py
@@ -8,7 +8,7 @@
 from os.path import join as pjoin
 import glob
 import sys
-from six.moves import configparser
+from nibabel.py3k import configparser
 from distutils.version import LooseVersion
 
 from .environment import get_nipy_user_dir, get_nipy_system_dir
diff --git a/nibabel/dft.py b/nibabel/dft.py
@@ -22,7 +22,7 @@
 
 import numpy
 
-from six import BytesIO
+from io import BytesIO
 
 from .nifti1 import Nifti1Header
 
diff --git a/nibabel/eulerangles.py b/nibabel/eulerangles.py
@@ -85,7 +85,7 @@
 
 import math
 
-from six.moves import reduce
+from functools import reduce
 
 import numpy as np
 
diff --git a/nibabel/externals/netcdf.py b/nibabel/externals/netcdf.py
@@ -41,7 +41,7 @@
 from numpy import little_endian as LITTLE_ENDIAN
 from functools import reduce
 
-from six import integer_types
+from nibabel.py3k import integer_types
 
 
 ABSENT = b'\x00\x00\x00\x00\x00\x00\x00\x00'
diff --git a/nibabel/externals/six.py b/nibabel/externals/six.py
@@ -9,4 +9,4 @@
               FutureWarning,
               stacklevel=2)
 
-from six import *  # noqa
+from nibabel.py3k import *  # noqa
diff --git a/nibabel/externals/tests/test_six.py b/nibabel/externals/tests/test_six.py
@@ -27,7 +27,7 @@ def test_old_namespace():
         # in this test run.
         if not previous_import:
             assert_equal(warns.pop(0).category, FutureWarning)
-        from six import BytesIO
+        from io import BytesIO
         assert_equal(warns, [])
         # The import from old module is the same as that from new
         assert_true(shim_BytesIO is BytesIO)
diff --git a/nibabel/filebasedimages.py b/nibabel/filebasedimages.py
@@ -8,7 +8,7 @@
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
 ''' Common interface for any image format--volume or surface, binary or xml.'''
 
-from six import string_types
+from nibabel.py3k import string_types
 from .fileholders import FileHolder
 from .filename_parser import (types_filenames, TypesFilenamesError,
                               splitext_addext)
diff --git a/nibabel/fileslice.py b/nibabel/fileslice.py
@@ -6,7 +6,7 @@
 from numbers import Integral
 from mmap import mmap
 
-from six.moves import reduce
+from functools import reduce
 
 import numpy as np
 
diff --git a/nibabel/freesurfer/io.py b/nibabel/freesurfer/io.py
@@ -8,7 +8,7 @@
 import time
 
 from collections import OrderedDict
-from six.moves import xrange
+from nibabel.py3k import xrange
 from ..openers import Opener
 
 
diff --git a/nibabel/freesurfer/tests/test_mghformat.py b/nibabel/freesurfer/tests/test_mghformat.py
@@ -13,7 +13,7 @@
 
 import numpy as np
 
-from six import BytesIO
+from io import BytesIO
 from .. import load, save
 from ...openers import ImageOpener
 from ..mghformat import MGHHeader, MGHError, MGHImage
diff --git a/nibabel/gifti/tests/test_gifti.py b/nibabel/gifti/tests/test_gifti.py
@@ -7,7 +7,7 @@
 import numpy as np
 
 import nibabel as nib
-from six import string_types
+from nibabel.py3k import string_types
 from nibabel.gifti import (GiftiImage, GiftiDataArray, GiftiLabel,
                            GiftiLabelTable, GiftiMetaData, GiftiNVPairs,
                            GiftiCoordSystem)
diff --git a/nibabel/optpkg.py b/nibabel/optpkg.py
@@ -1,7 +1,7 @@
 """ Routines to support optional packages """
 from distutils.version import LooseVersion
 
-from six import string_types
+from nibabel.py3k import string_types
 
 try:
     import nose
diff --git a/nibabel/py3k.py b/nibabel/py3k.py
@@ -1,11 +1,33 @@
 """
 Python 3 compatibility tools.
 
-Copied from numpy/compat/py3k.
+Copied from numpy/compat/py3k, covered by BSD license.
+
+``with_metaclass`` copied from six.py at changeset 433:92e1c746e1ab
+
+six.py covered by the following license::
+
+    # Copyright (c) 2010-2017 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.
 
-Please prefer the routines in the six module when possible.
-
-BSD license
 """
 
 __all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar',
@@ -21,6 +43,8 @@
     bytes = bytes
     unicode = str
     asunicode = str
+    string_types = (str,)
+    integer_types = (int,)
 
     def asbytes(s):
         if isinstance(s, bytes):
@@ -41,14 +65,20 @@ def open_latin1(filename, mode='r'):
     ints2bytes = lambda seq: bytes(seq)
     ZEROB = bytes([0])
     FileNotFoundError = FileNotFoundError
-else:
+    import configparser
+    zip = zip
+    from itertools import zip_longest
+    xrange = range
+else:  # Python 2
     import StringIO
     StringIO = BytesIO = StringIO.StringIO
     bytes = str
     unicode = unicode
     asbytes = str
     asstr = str
     strchar = 'S'
+    string_types = (basestring,)
+    integer_types = (int, long)
 
     def isfileobj(f):
         return isinstance(f, file)
@@ -66,6 +96,10 @@ def open_latin1(filename, mode='r'):
     class FileNotFoundError(IOError):
         pass
 
+    import ConfigParser as configparser  # noqa
+    from itertools import izip as zip, izip_longest as zip_longest
+    xrange = xrange
+
 
 def getexception():
     return sys.exc_info()[1]
@@ -83,3 +117,18 @@ def asunicode_nested(x):
         return [asunicode_nested(y) for y in x]
     else:
         return asunicode(x)
+
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # Copied from six.py at 433:92e1c746e1ab with thanks.
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
diff --git a/nibabel/spm99analyze.py b/nibabel/spm99analyze.py
@@ -10,7 +10,7 @@
 import warnings
 import numpy as np
 
-from six import BytesIO
+from io import BytesIO
 
 from .spatialimages import HeaderDataError, HeaderTypeError
 
diff --git a/nibabel/streamlines/__init__.py b/nibabel/streamlines/__init__.py
@@ -2,7 +2,7 @@
 """
 import os
 import warnings
-from six import string_types
+from nibabel.py3k import string_types
 
 from .header import Field
 from .array_sequence import ArraySequence
diff --git a/nibabel/streamlines/tests/test_streamlines.py b/nibabel/streamlines/tests/test_streamlines.py
@@ -6,7 +6,7 @@
 from os.path import join as pjoin
 
 import nibabel as nib
-from six import BytesIO
+from io import BytesIO
 from nibabel.tmpdirs import InTemporaryDirectory
 
 from nibabel.testing import data_path
diff --git a/nibabel/streamlines/tests/test_tractogram.py b/nibabel/streamlines/tests/test_tractogram.py
@@ -10,7 +10,7 @@
 from nibabel.testing import clear_and_catch_warnings
 from nose.tools import assert_equal, assert_raises, assert_true
 from numpy.testing import assert_array_equal, assert_array_almost_equal
-from six.moves import zip
+from nibabel.py3k import zip
 
 from .. import tractogram as module_tractogram
 from ..tractogram import TractogramItem, Tractogram, LazyTractogram
diff --git a/nibabel/streamlines/tests/test_trk.py b/nibabel/streamlines/tests/test_trk.py
@@ -4,7 +4,7 @@
 import numpy as np
 from os.path import join as pjoin
 
-from six import BytesIO
+from io import BytesIO
 
 from nibabel.testing import data_path
 from nibabel.testing import clear_and_catch_warnings, assert_arr_dict_equal
diff --git a/nibabel/streamlines/tractogram_file.py b/nibabel/streamlines/tractogram_file.py
@@ -1,7 +1,7 @@
 """  Define abstract interface for Tractogram file classes
 """
 from abc import ABCMeta, abstractmethod
-from six import with_metaclass
+from nibabel.py3k import with_metaclass
 
 from .header import Field
 
diff --git a/nibabel/testing/__init__.py b/nibabel/testing/__init__.py
@@ -26,7 +26,7 @@
 except ImportError:
     pass
 
-from six.moves import zip_longest
+from nibabel.py3k import zip_longest
 
 # set path to example data
 data_path = abspath(pjoin(dirname(__file__), '..', 'tests', 'data'))
diff --git a/nibabel/tests/test_analyze.py b/nibabel/tests/test_analyze.py
@@ -20,7 +20,7 @@
 
 import numpy as np
 
-from six import BytesIO, StringIO
+from io import BytesIO, StringIO
 from ..spatialimages import (HeaderDataError, HeaderTypeError,
                              supported_np_types)
 from ..analyze import AnalyzeHeader, AnalyzeImage
diff --git a/nibabel/tests/test_api_validators.py b/nibabel/tests/test_api_validators.py
@@ -2,7 +2,7 @@
 """
 from __future__ import division, print_function, absolute_import
 
-from six import with_metaclass
+from nibabel.py3k import with_metaclass
 
 from nose.tools import assert_equal
 
diff --git a/nibabel/tests/test_arrayproxy.py b/nibabel/tests/test_arrayproxy.py
@@ -12,7 +12,7 @@
 
 import warnings
 
-from six import BytesIO
+from io import BytesIO
 from ..tmpdirs import InTemporaryDirectory
 
 import numpy as np
diff --git a/nibabel/tests/test_arraywriters.py b/nibabel/tests/test_arraywriters.py
@@ -10,7 +10,7 @@
 import itertools
 import numpy as np
 
-from six import BytesIO
+from io import BytesIO
 from ..arraywriters import (SlopeInterArrayWriter, SlopeArrayWriter,
                             WriterError, ScalingError, ArrayWriter,
                             make_array_writer, get_slope_inter)
diff --git a/nibabel/tests/test_batteryrunners.py b/nibabel/tests/test_batteryrunners.py
@@ -9,7 +9,7 @@
 ''' Tests for BatteryRunner and Report objects
 '''
 
-from six import StringIO
+from io import StringIO
 
 import logging
 
diff --git a/nibabel/tests/test_dft.py b/nibabel/tests/test_dft.py
@@ -3,7 +3,7 @@
 
 import os
 from os.path import join as pjoin, dirname
-from six import BytesIO
+from io import BytesIO
 from ..testing import suppress_warnings
 
 import numpy as np
diff --git a/nibabel/tests/test_fileholders.py b/nibabel/tests/test_fileholders.py
@@ -1,7 +1,7 @@
 """ Testing fileholders
 """
 
-from six import BytesIO
+from io import BytesIO
 
 
 from ..fileholders import FileHolder
diff --git a/nibabel/tests/test_files_interface.py b/nibabel/tests/test_files_interface.py
@@ -13,7 +13,7 @@
 import numpy as np
 
 from .. import Nifti1Image, Nifti1Pair, MGHImage, all_image_classes
-from six import BytesIO
+from io import BytesIO
 from ..fileholders import FileHolderError
 from ..spatialimages import SpatialImage
 
diff --git a/nibabel/tests/test_image_api.py b/nibabel/tests/test_image_api.py
@@ -24,7 +24,7 @@
 
 import warnings
 from functools import partial
-from six import string_types
+from nibabel.py3k import string_types
 
 import numpy as np
 
diff --git a/nibabel/tests/test_image_load_save.py b/nibabel/tests/test_image_load_save.py
@@ -8,7 +8,7 @@
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
 ''' Tests for loader function '''
 from __future__ import division, print_function, absolute_import
-from six import BytesIO
+from io import BytesIO
 
 import shutil
 from os.path import dirname, join as pjoin
diff --git a/nibabel/tests/test_nifti1.py b/nibabel/tests/test_nifti1.py
@@ -18,7 +18,7 @@
 from nibabel.affines import from_matvec
 from nibabel.casting import type_info, have_binary128
 from nibabel.eulerangles import euler2mat
-from six import BytesIO
+from io import BytesIO
 from nibabel.nifti1 import (load, Nifti1Header, Nifti1PairHeader, Nifti1Image,
                             Nifti1Pair, Nifti1Extension, Nifti1DicomExtension,
                             Nifti1Extensions, data_type_codes, extension_codes,
diff --git a/nibabel/tests/test_proxy_api.py b/nibabel/tests/test_proxy_api.py
@@ -35,7 +35,7 @@
 
 import numpy as np
 
-from six import string_types
+from nibabel.py3k import string_types
 from ..volumeutils import apply_read_scaling
 from ..analyze import AnalyzeHeader
 from ..spm99analyze import Spm99AnalyzeHeader
diff --git a/nibabel/tests/test_round_trip.py b/nibabel/tests/test_round_trip.py
diff --git a/nibabel/tests/test_scaling.py b/nibabel/tests/test_scaling.py
diff --git a/nibabel/tests/test_spatialimages.py b/nibabel/tests/test_spatialimages.py
diff --git a/nibabel/tests/test_spm99analyze.py b/nibabel/tests/test_spm99analyze.py
diff --git a/nibabel/tests/test_trackvis.py b/nibabel/tests/test_trackvis.py
diff --git a/nibabel/tests/test_utils.py b/nibabel/tests/test_utils.py
diff --git a/nibabel/tests/test_wrapstruct.py b/nibabel/tests/test_wrapstruct.py
