diff --git a/.gitignore b/.gitignore index 8ea3204..542467b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ build *.pyc *.c *.so +*.egg-info/ # OS or Editor folders .DS_Store diff --git a/deepdish/core.py b/deepdish/core.py index 3782a21..d242bc8 100644 --- a/deepdish/core.py +++ b/deepdish/core.py @@ -5,7 +5,7 @@ import itertools as itr import sys from contextlib import contextmanager -warnings.simplefilter("ignore", np.ComplexWarning) +warnings.simplefilter("ignore", np.exceptions.ComplexWarning) _is_verbose = False _is_silent = False diff --git a/deepdish/io/hdf5io.py b/deepdish/io/hdf5io.py index 372ee7b..ac4712e 100644 --- a/deepdish/io/hdf5io.py +++ b/deepdish/io/hdf5io.py @@ -112,13 +112,13 @@ def _get_compression_filters(compression='default'): def _save_ndarray(handler, group, name, x, filters=None): - if np.issubdtype(x.dtype, np.unicode_): + if np.issubdtype(x.dtype, np.str_): # Convert unicode strings to pure byte arrays strtype = b'unicode' itemsize = x.itemsize // 4 atom = tables.UInt8Atom() x = x.view(dtype=np.uint8) - elif np.issubdtype(x.dtype, np.string_): + elif np.issubdtype(x.dtype, np.bytes_): strtype = b'ascii' itemsize = x.itemsize atom = tables.StringAtom(itemsize)