Skip to content

Use (new) buffer protocol in Pickle.decode on Python 2 #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 3, 2018
Merged

Use (new) buffer protocol in Pickle.decode on Python 2 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da31f3e
Use (new) buffer protocol in `Pickle.decode`
jakirkham Dec 2, 2018
3e003bd
Link this PR to `Pickle.decode` release note
jakirkham Dec 2, 2018
48bf39b
Merge branch 'master' into avoid_decode_copy_pickle_py2
alimanfoo Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/release.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Release notes
-----

* Handle (new) buffer protocol conforming types in ``Pickle.decode``.
By :user:`John Kirkham <jakirkham>`, :issue:`143`.
By :user:`John Kirkham <jakirkham>`, :issue:`143`, :issue:`150`.

* Fix other ``VLen*`` encode() methods to return numpy arrays as well.
By :user:`John Kirkham <jakirkham>`, :issue:`144`.
Expand Down
10 changes: 6 additions & 4 deletions numcodecs/pickles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@


from .abc import Codec
from .compat import PY2, ensure_bytes, ensure_contiguous_ndarray
from .compat import PY2, ensure_contiguous_ndarray


if PY2: # pragma: py3 no cover
import cPickle as pickle
from cStringIO import StringIO
else: # pragma: py2 no cover
import pickle

Expand Down Expand Up @@ -48,12 +49,13 @@ def encode(self, buf):
return pickle.dumps(buf, protocol=self.protocol)

def decode(self, buf, out=None):
buf = ensure_contiguous_ndarray(buf)

if PY2: # pragma: py3 no cover
buf = ensure_bytes(buf)
dec = pickle.load(StringIO(buf))
else: # pragma: py2 no cover
buf = ensure_contiguous_ndarray(buf)
dec = pickle.loads(buf)

dec = pickle.loads(buf)
if out is not None:
np.copyto(out, dec)
return out
Expand Down