Skip to content

Fix fallback Unpacker.read_bytes() #388

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
methane merged 2 commits into from
Dec 6, 2019
Merged

Fix fallback Unpacker.read_bytes() #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be520a4
Fix fallback Unpacker.read()
methane Dec 6, 2019
15e017a
black
methane Dec 6, 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
4 changes: 3 additions & 1 deletion msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,9 @@ def _get_extradata(self):
return self._buffer[self._buff_i :]

def read_bytes(self, n):
return self._read(n)
ret = self._read(n)
self._consume()
return ret

def _read(self, n):
# (int) -> bytearray
Expand Down
9 changes: 9 additions & 0 deletions test/test_sequnpack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ def test_readbytes():
assert unpacker.unpack() == ord(b"a")
assert unpacker.unpack() == ord(b"r")

# Issue 352
u = Unpacker()
u.feed(b"x")
assert bytes(u.read_bytes(1)) == b"x"
with raises(StopIteration):
next(u)
u.feed(b"\1")
assert next(u) == 1


def test_issue124():
unpacker = Unpacker()
Expand Down