Merge fa09582 into 1d5ef09

Blosc · Mar 10, 2018 · 085e5b0 · 085e5b0
2 parents 1d5ef09 + fa09582
commit 085e5b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -1410,7 +1410,7 @@ Thanks
 Author, Copyright and License
 -----------------------------
 
-© 2012-2015 Valentin Haenel <valentin@haenel.co>
+© 2012-2018 Valentin Haenel <valentin@haenel.co>
 
 Bloscpack is licensed under the terms of the MIT License.
 

diff --git a/bloscpack/numpy_io.py b/bloscpack/numpy_io.py
@@ -103,7 +103,7 @@ def _conv(descr):
             descr = [_conv(d) for d in descr]
         else:
             descr = tuple([_conv(d) for d in descr])
-    elif six.PY2 and isinstance(descr, unicode): # pragma: no cover
+    elif six.PY2 and isinstance(descr, unicode):  # pragma: no cover
         descr = str(descr)
     return descr
 

diff --git a/test/test_numpy_io.py b/test/test_numpy_io.py
@@ -240,6 +240,7 @@ def test_alternate_cname():
             ('lz4hc', 1),
             ('snappy', 2),
             ('zlib', 3),
+            ('zstd', 4),
             ]:
         blosc_args = BloscArgs(cname=cname)
         array_ = np.linspace(0, 1, 2e6)