Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-20 04:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleaner read_bytes and a test case

Browse source 
No longer reads via buffer for unbuffered bytes
This commit is contained in:
Joel Nothman 2012-09-23 11:13:44 +10:00
parent ffec10dff3
commit e7c51d9089
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
msgpack/_msgpack.pyx
View file

@ -458,13 +458,11 @@ cdef class Unpacker(object):
def read_bytes(self, Py_ssize_t nbytes):
"""read a specified number of raw bytes from the stream"""
cdef size_t nread
ret = ''
while len(ret) < nbytes and self.file_like is not None:
if self.buf_head == self.buf_tail:
self.fill_buffer()
nread = min(self.buf_tail - self.buf_head, nbytes - len(ret))
ret += PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
self.buf_head += nread
nread = min(self.buf_tail - self.buf_head, nbytes)
ret = PyBytes_FromStringAndSize(self.buf + self.buf_head, nread)
self.buf_head += nread
if len(ret) < nbytes and self.file_like is not None:
ret += self.file_like.read(nbytes - len(ret))
return ret
def __iter__(self):