Skip to content

Commit 9e2a39c

Browse files
committed
Be numpy 1.11 compliant
1 parent 9b08496 commit 9e2a39c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

nibabel/streamlines/array_sequence.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def __init__(self, iterable=None, buffer_size=4):
7575
except TypeError:
7676
# Can't get the number of elements in iterable. So,
7777
# we use a memory buffer while building the ArraySequence.
78-
n_rows_buffer = buffer_size*1024**2 // e.nbytes
78+
n_rows_buffer = int(buffer_size*1024**2 // e.nbytes)
7979
new_shape = (n_rows_buffer,) + e.shape[1:]
8080

8181
self._data = np.empty(new_shape, dtype=e.dtype)

nibabel/streamlines/tractogram.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self, *args, **kwargs):
4242
def __getitem__(self, key):
4343
try:
4444
return self.store[key]
45-
except (KeyError, TypeError):
45+
except (KeyError, TypeError, IndexError):
4646
pass # Maybe it is an integer or a slicing object
4747

4848
# Try to interpret key as an index/slice for every data element, in
@@ -53,7 +53,7 @@ def __getitem__(self, key):
5353
try:
5454
for k, v in self.items():
5555
new_dict[k] = v[idx]
56-
except (TypeError, ValueError):
56+
except (TypeError, ValueError, IndexError):
5757
pass
5858
else:
5959
return new_dict

0 commit comments

Comments
 (0)