Commit e7eb3ff2 authored by Sebastien Petitdemange's avatar Sebastien Petitdemange
Browse files

Merge branch 'unpickle_jens' into 'master'

look for KeyError if pickle is failing

See merge request !1760
parents c4240bfa abf58f23
......@@ -53,7 +53,7 @@ def data_from_bytes(data, shape=None, dtype=None):
try:
return pickle.loads(data)
except pickle.UnpicklingError:
except (pickle.UnpicklingError, KeyError):
if dtype is not None:
try:
t = numpy.dtype(dtype)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment