BF: remove uses of float indices; double ellipsis

Float indices becoming illegal in numpy 1.12.  Also double ellipses.

Author: matthew-brett

nibabel/nicom/dicomwrappers.py

@@ -11,6 +11,7 @@
 processing that needs to raise an error, should be in a method, rather
 than in a property, or property-like thing.
 """
+from __future__ import division
 
 import operator
 
@@ -724,7 +725,7 @@ class MosaicWrapper(SiemensWrapper):
     Adds attributes:
 
     * n_mosaic : int
-    * mosaic_size : float
+    * mosaic_size : int
     """
     is_mosaic = True
 
@@ -758,7 +759,7 @@ def __init__(self, dcm_data, csa_header=None, n_mosaic=None):
                                    'header; is this really '
                                    'Siemens mosiac data?')
         self.n_mosaic = n_mosaic
-        self.mosaic_size = np.ceil(np.sqrt(n_mosaic))
+        self.mosaic_size = int(np.ceil(np.sqrt(n_mosaic)))
 
     @one_time
     def image_shape(self):

nibabel/orientations.py

@@ -220,7 +220,8 @@ def inv_ornt_aff(ornt, shape):
     # ornt indicates the transpose that has occurred to get the current
     # ordering, relative to canonical, so we just use that.
     # undo_reorder is a row permutatation matrix
-    undo_reorder = np.eye(p + 1)[list(ornt[:, 0]) + [p], :]
+    axis_transpose = [int(v) for v in ornt[:, 0]]
+    undo_reorder = np.eye(p + 1)[axis_transpose + [p], :]
     undo_flip = np.diag(list(ornt[:, 1]) + [1.0])
     center_trans = -(shape - 1) / 2.0
     undo_flip[:p, p] = (ornt[:, 1] * center_trans) - center_trans

nibabel/tests/test_fileslice.py

@@ -7,9 +7,13 @@
 from io import BytesIO
 from itertools import product
 from functools import partial
+from distutils.version import LooseVersion
 
 import numpy as np
 
+# np > 1.11 makes double ellipsis illegal in indices
+HAVE_NP_GT_1p11 = LooseVersion(np.__version__) > '1.11'
+
 from ..fileslice import (is_fancy, canonical_slicers, fileslice,
                          predict_shape, read_segments, _positive_slice,
                          threshold_heuristic, optimize_slicer, slice2len,
@@ -41,7 +45,11 @@ def test_is_fancy():
     for slice0 in slices:
         _check_slice(slice0)
         _check_slice((slice0,))  # tuple is same
+        # Double ellipsis illegal in np 1.12dev - set up check for that case
+        maybe_bad = HAVE_NP_GT_1p11 and slice0 is Ellipsis
         for slice1 in slices:
+            if maybe_bad and slice1 is Ellipsis:
+                continue
             _check_slice((slice0, slice1))
     assert_false(is_fancy((None,)))
     assert_false(is_fancy((None, 1)))