Skip to content

Use binary_type in MongoDBStore.__getitem__ for Python 2 only #401

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
jakirkham merged 2 commits into from
Feb 13, 2019
Merged

Use binary_type in MongoDBStore.__getitem__ for Python 2 only #401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bcbc1d
Drop binary_type cast in MongoDBStore.__getitem__
jakirkham Feb 12, 2019
efa3ee9
Coerce PyMongo values to `binary_type` on Python 2
jakirkham Feb 13, 2019
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
10 changes: 9 additions & 1 deletion zarr/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,7 +2147,15 @@ def __getitem__(self, key):
if doc is None:
raise KeyError(key)
else:
return binary_type(doc[self._value])
value = doc[self._value]

# Coerce `bson.Binary` to `bytes` type on Python 2.
# PyMongo handles this conversion for us on Python 3.
# ref: http://api.mongodb.com/python/current/python3.html#id3
if PY2: # pragma: py3 no cover
value = binary_type(value)

return value

def __setitem__(self, key, value):
value = ensure_bytes(value)
Expand Down