Merge pull request #147 from alimanfoo/issue_143

Test and fix for #143 index with numpy integer item

Author: alimanfoo

.travis.yml

@@ -6,21 +6,15 @@ branches:
 
 sudo: false
 
-addons:
-  apt:
-    packages:
-      - liblzma-dev
-
 python:
   - 2.7
   - 3.4
   - 3.5
   - 3.6
 
 install:
-  - pip install -U tox-travis coveralls pip setuptools wheel
-  - pip install -r requirements_dev.txt
-  - python setup.py build_ext --inplace
+  - pip install -U pip setuptools wheel
+  - pip install -U tox-travis coveralls
 
 script:
   - tox

zarr/compat.py

@@ -11,12 +11,10 @@
 
     text_type = unicode
     binary_type = str
-    integer_types = (int, long)
     reduce = reduce
 
 else:
 
     text_type = str
     binary_type = bytes
-    integer_types = int,
     from functools import reduce

zarr/tests/test_core.py

@@ -130,6 +130,11 @@ def test_array_1d(self):
         # single item
         eq(a[0], z[0])
         eq(a[-1], z[-1])
+        # unusual integer items
+        eq(a[42], z[np.int64(42)])
+        eq(a[42], z[np.int32(42)])
+        eq(a[42], z[np.uint64(42)])
+        eq(a[42], z[np.uint32(42)])
 
         # check partial assignment
         b = np.arange(1e5, 2e5)

zarr/util.py

@@ -2,12 +2,13 @@
 from __future__ import absolute_import, print_function, division
 import operator
 from textwrap import TextWrapper
+import numbers
 
 
 import numpy as np
 
 
-from zarr.compat import integer_types, PY2, reduce
+from zarr.compat import PY2, reduce
 
 
 def normalize_shape(shape):
@@ -17,7 +18,7 @@ def normalize_shape(shape):
         raise TypeError('shape is None')
 
     # handle 1D convenience form
-    if isinstance(shape, integer_types):
+    if isinstance(shape, numbers.Integral):
         shape = (int(shape),)
 
     # normalize
@@ -89,7 +90,7 @@ def normalize_chunks(chunks, shape, typesize):
         return guess_chunks(shape, typesize)
 
     # handle 1D convenience form
-    if isinstance(chunks, integer_types):
+    if isinstance(chunks, numbers.Integral):
         chunks = (int(chunks),)
 
     # handle bad dimensionality
@@ -137,7 +138,8 @@ def normalize_axis_selection(item, length):
     """Convenience function to normalize a selection within a single axis
     of size `l`."""
 
-    if isinstance(item, int):
+    if isinstance(item, numbers.Integral):
+        item = int(item)
 
         # handle wraparound
         if item < 0:
@@ -191,7 +193,7 @@ def normalize_array_selection(item, shape):
     the given `shape`."""
 
     # normalize item
-    if isinstance(item, integer_types):
+    if isinstance(item, numbers.Integral):
         item = (int(item),)
     elif isinstance(item, slice):
         item = (item,)