Merge branch 'master' into ret_ndarray_encode_decode

Author: alimanfoo

docs/release.rst

@@ -30,7 +30,7 @@ Release notes
 * Add Python 3.7 (by :user:`John Kirkham <jakirkham>`; :issue:`92`).
 
 * Add codec :class:`numcodecs.gzip.GZip` to replace ``gzip`` alias for ``zlib``,
-  which was incorrect (by :user:`Jan Funke <funkey>`; :issue:`87`).
+  which was incorrect (by :user:`Jan Funke <funkey>`; :issue:`87`; and :user:`John Kirkham <jakirkham>`, :issue:`134`).
 
 * Corrects handling of ``NaT`` in ``datetime64`` and ``timedelta64`` in various
   compressors (by :user:`John Kirkham <jakirkham>`; :issue:`127`, :issue:`131`).

numcodecs/gzip.py

@@ -5,7 +5,7 @@
 
 
 from .abc import Codec
-from .compat import ndarray_copy, ensure_ndarray, ensure_contiguous_ndarray, PY2
+from .compat import ensure_bytes, ensure_ndarray, ensure_contiguous_ndarray, PY2
 
 
 class GZip(Codec):
@@ -50,16 +50,27 @@ def encode(self, buf):
     def decode(self, buf, out=None):
 
         # normalise inputs
-        buf = ensure_contiguous_ndarray(buf)
-        if out is not None:
-            out = ensure_contiguous_ndarray(out)
+        if PY2:  # pragma: py3 no cover
+            # On Python 2, BytesIO always copies.
+            # Merely ensure the data supports the (new) buffer protocol.
+            buf = ensure_contiguous_ndarray(buf)
+        else:  # pragma: py2 no cover
+            # BytesIO only copies if the data is not of `bytes` type.
+            # This allows `bytes` objects to pass through without copying.
+            buf = ensure_bytes(buf)
 
         # do decompression
         buf = io.BytesIO(buf)
         with _gzip.GzipFile(fileobj=buf, mode='rb') as decompressor:
-            decompressed = decompressor.read()
+            if out is not None:
+                out_view = ensure_contiguous_ndarray(out)
+                decompressor.readinto(out_view)
+                if decompressor.read(1) != b'':
+                    raise ValueError("Unable to fit data into `out`")
+            else:
+                out = ensure_ndarray(decompressor.read())
 
         # handle destination - Python standard library zlib module does not
         # support direct decompression into buffer, so we have to copy into
         # out if given
-        return ndarray_copy(decompressed, out)
+        return out

numcodecs/tests/test_gzip.py

@@ -93,3 +93,19 @@ def test_err_encode_non_contiguous():
     for codec in codecs:
         with pytest.raises(ValueError):
             codec.encode(arr)
+
+
+def test_err_out_too_small():
+    arr = np.arange(10, dtype='i4')
+    out = np.empty_like(arr)[:-1]
+    for codec in codecs:
+        with pytest.raises(ValueError):
+            codec.decode(codec.encode(arr), out)
+
+
+def test_out_too_large():
+    out = np.empty((10,), dtype='i4')
+    arr = out[:-1]
+    arr[:] = 5
+    for codec in codecs:
+        codec.decode(codec.encode(arr), out)