RF: Drop six.moves

Author: effigies

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

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

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/fileslice.py

@@ -5,7 +5,7 @@
 from numbers import Integral
 from mmap import mmap
 
-from six.moves import reduce
+from functools import reduce
 
 import numpy as np
 

nibabel/freesurfer/io.py

@@ -7,7 +7,6 @@
 import time
 
 from collections import OrderedDict
-from six.moves import xrange
 from ..openers import Opener
 
 
@@ -431,7 +430,7 @@ def _read_annot_ctab_old_format(fobj, n_entries):
     orig_tab = orig_tab[:-1]
     names = list()
     ctab = np.zeros((n_entries, 5), dt)
-    for i in xrange(n_entries):
+    for i in range(n_entries):
         # structure name length + string
         name_length = np.fromfile(fobj, dt, 1)[0]
         name = np.fromfile(fobj, "|S%d" % name_length, 1)[0]
@@ -482,7 +481,7 @@ def _read_annot_ctab_new_format(fobj, ctab_version):
     # number of LUT entries present in the file
     entries_to_read = np.fromfile(fobj, dt, 1)[0]
     names = list()
-    for _ in xrange(entries_to_read):
+    for _ in range(entries_to_read):
         # index of this entry
         idx = np.fromfile(fobj, dt, 1)[0]
         # structure name length + string

nibabel/streamlines/tests/test_tractogram.py

@@ -10,7 +10,6 @@
 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 .. import tractogram as module_tractogram
 from ..tractogram import is_data_dict, is_lazy_dict

nibabel/testing/__init__.py

@@ -29,7 +29,7 @@
 except ImportError:
     pass
 
-from six.moves import zip_longest
+from itertools import zip_longest
 
 # set path to example data
 data_path = abspath(pjoin(dirname(__file__), '..', 'tests', 'data'))