diff --git a/tofu/utils.py b/tofu/utils.py index 2e2d50ce8..7d722b41d 100644 --- a/tofu/utils.py +++ b/tofu/utils.py @@ -453,8 +453,7 @@ def _filefind(name, path=None, lmodes=['.npz','.mat']): return name, mode, pfe - -def load(name, path=None, strip=None, verb=True): +def load(name, path=None, strip=None, verb=True, allow_pickle=None): """ Load a tofu object file Can load from .npz or .txt files @@ -483,7 +482,7 @@ def load(name, path=None, strip=None, verb=True): obj = _load_from_txt(name, pfe) else: if mode == 'npz': - dd = _load_npz(pfe) + dd = _load_npz(pfe, allow_pickle=allow_pickle) elif mode == 'mat': dd = _load_mat(pfe) @@ -580,13 +579,15 @@ def _get_load_npzmat_dict(out, pfe, mode='npz', exclude_keys=[]): return dout - -def _load_npz(pfe): +def _load_npz(pfe, allow_pickle=None): + if allow_pickle is None: + allow_pickle = True try: - out = np.load(pfe, mmap_mode=None) + out = np.load(pfe, mmap_mode=None, allow_pickle=allow_pickle) except UnicodeError: - out = np.load(pfe, mmap_mode=None, encoding='latin1') + out = np.load(pfe, mmap_mode=None, allow_pickle=allow_pickle, + encoding='latin1') except Exception as err: raise err diff --git a/tofu/version.py b/tofu/version.py index 2ee9c73d6..3c36d1b56 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b4-56-g4622b310' +__version__ = '1.4.2b4-63-gf16dd82e'