Merge branch 'skip' of git://github.com/jnothman/msgpack-python into skip

1 files changed, 17 insertions, 8 deletions

diff --git a/msgpack/_msgpack.pyx b/msgpack/_msgpack.pyx
index 12ee2ea..9061d42 100644
--- a/msgpack/_msgpack.pyx
+++ b/msgpack/_msgpack.pyx
@@ -209,7 +209,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)
 
@@ -255,7 +255,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:
         obj = template_data(&ctx)
         if off < buf_len:
@@ -451,15 +451,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.read_from_file()
@@ -468,6 +465,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