summaryrefslogtreecommitdiff
path: root/msgpack/_packer.pyx
diff options
context:
space:
mode:
authorjfolz <theriddling@gmail.com>2017-05-18 13:03:15 +0200
committerINADA Naoki <methane@users.noreply.github.com>2017-05-18 20:03:15 +0900
commitf0f2c0b39703e0129d2352c71ec9811a8f275cc8 (patch)
tree927b079e6be25fe7db2e7108b75efdd1a79c1692 /msgpack/_packer.pyx
parenta8d9162ca6cff6101c1f6b9547e94749c6acae96 (diff)
downloadmsgpack-python-f0f2c0b39703e0129d2352c71ec9811a8f275cc8.tar.gz
Packer accepts bytearray objects (#229)
Diffstat (limited to 'msgpack/_packer.pyx')
-rw-r--r--msgpack/_packer.pyx14
1 files changed, 12 insertions, 2 deletions
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
index f24aa70..5a81709 100644
--- a/msgpack/_packer.pyx
+++ b/msgpack/_packer.pyx
@@ -10,6 +10,8 @@ from msgpack import ExtType
cdef extern from "Python.h":
int PyMemoryView_Check(object obj)
+ int PyByteArray_Check(object obj)
+ int PyByteArray_CheckExact(object obj)
cdef extern from "pack.h":
@@ -39,6 +41,14 @@ cdef int DEFAULT_RECURSE_LIMIT=511
cdef size_t ITEM_LIMIT = (2**32)-1
+cdef inline int PyBytesLike_Check(object o):
+ return PyBytes_Check(o) or PyByteArray_Check(o)
+
+
+cdef inline int PyBytesLike_CheckExact(object o):
+ return PyBytes_CheckExact(o) or PyByteArray_CheckExact(o)
+
+
cdef class Packer(object):
"""
MessagePack Packer
@@ -174,10 +184,10 @@ cdef class Packer(object):
else:
dval = o
ret = msgpack_pack_double(&self.pk, dval)
- elif PyBytes_CheckExact(o) if strict_types else PyBytes_Check(o):
+ elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
L = len(o)
if L > ITEM_LIMIT:
- raise PackValueError("bytes is too large")
+ raise PackValueError("%s is too large" % type(o).__name__)
rawval = o
ret = msgpack_pack_bin(&self.pk, L)
if ret == 0: