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

A first implementation of Unpacker.skip()

Browse source
This commit is contained in:
Joel Nothman 2012-09-22 22:57:00 +10:00
parent f14d926e1d
commit 28058fb53d
2 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
msgpack/_msgpack.pyx
View file

@ -200,7 +200,7 @@ cdef extern from "unpack.h":
PyObject* key
int template_execute(template_context* ctx, const_char_ptr data,
size_t len, size_t* off) except -1
size_t len, size_t* off, bool construct) except -1
void template_init(template_context* ctx)
object template_data(template_context* ctx)
@ -246,7 +246,7 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
if not PyCallable_Check(list_hook):
raise TypeError("list_hook must be a callable.")
ctx.user.list_hook = <PyObject*>list_hook
ret = template_execute(&ctx, buf, buf_len, &off)
ret = template_execute(&ctx, buf, buf_len, &off, True)
if ret == 1:
return template_data(&ctx)
else:
@ -440,15 +440,12 @@ cdef class Unpacker(object):
else:
self.file_like = None
cpdef unpack(self):
"""unpack one object"""
cpdef _unpack(self, bool construct):
cdef int ret
while 1:
ret = template_execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
ret = template_execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head, construct)
if ret == 1:
o = template_data(&self.ctx)
template_init(&self.ctx)
return o
return
elif ret == 0:
if self.file_like is not None:
self.fill_buffer()
@ -457,6 +454,18 @@ cdef class Unpacker(object):
else:
raise ValueError("Unpack failed: error = %d" % (ret,))
cpdef unpack(self):
"""unpack one object"""
self._unpack(True)
o = template_data(&self.ctx)
template_init(&self.ctx)
cpdef skip(self):
"""read and ignore one object, returning None"""
self._unpack(False)
template_init(&self.ctx)
def __iter__(self):
return self