generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-20 21:39:53 +01:00
Code Issues Projects Releases Wiki Activity

python: refactoring.

Browse Source
This commit is contained in:
INADA Naoki 2011-01-29 07:27:10 +09:00
parent e89cd81022
commit 9c9b2c25ea
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/msgpack/_msgpack.pyx
View File

@ -41,7 +41,7 @@ cdef class Packer(object):
astream.write(packer.pack(b)) astream.write(packer.pack(b))
""" """
cdef msgpack_packer pk cdef msgpack_packer pk
cdef object default cdef object _default
def __cinit__(self): def __cinit__(self):
cdef int buf_size = 1024*1024 cdef int buf_size = 1024*1024
@ -55,13 +55,12 @@ cdef class Packer(object):
if default is not None: if default is not None:
if not PyCallable_Check(default): if not PyCallable_Check(default):
raise TypeError("default must be a callable.") raise TypeError("default must be a callable.")
self.default = default self._default = default
def __dealloc__(self): def __dealloc__(self):
free(self.pk.buf); free(self.pk.buf);
cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT, cdef int _pack(self, object o, int nest_limit=DEFAULT_RECURSE_LIMIT) except -1:
default=None) except -1:
cdef long long llval cdef long long llval
cdef unsigned long long ullval cdef unsigned long long ullval
cdef long longval cdef long longval
@ -109,18 +108,18 @@ cdef class Packer(object):
ret = msgpack_pack_map(&self.pk, len(d)) ret = msgpack_pack_map(&self.pk, len(d))
if ret == 0: if ret == 0:
for k,v in d.items(): for k,v in d.items():
ret = self._pack(k, nest_limit-1, default) ret = self._pack(k, nest_limit-1)
if ret != 0: break if ret != 0: break
ret = self._pack(v, nest_limit-1, default) ret = self._pack(v, nest_limit-1)
if ret != 0: break if ret != 0: break
elif PySequence_Check(o): elif PySequence_Check(o):
ret = msgpack_pack_array(&self.pk, len(o)) ret = msgpack_pack_array(&self.pk, len(o))
if ret == 0: if ret == 0:
for v in o: for v in o:
ret = self._pack(v, nest_limit-1, default) ret = self._pack(v, nest_limit-1)
if ret != 0: break if ret != 0: break
elif default is not None: elif self._default is not None:
o = self.default(o) o = self._default(o)
ret = self._pack(o, nest_limit) ret = self._pack(o, nest_limit)
else: else:
raise TypeError("can't serialize %r" % (o,)) raise TypeError("can't serialize %r" % (o,))
@ -128,7 +127,7 @@ cdef class Packer(object):
def pack(self, object obj): def pack(self, object obj):
cdef int ret cdef int ret
ret = self._pack(obj, DEFAULT_RECURSE_LIMIT, self.default) ret = self._pack(obj, DEFAULT_RECURSE_LIMIT)
if ret: if ret:
raise TypeError raise TypeError
buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length) buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)