diff options
author | INADA Naoki <songofacandy@gmail.com> | 2018-02-23 11:35:09 +0900 |
---|---|---|
committer | INADA Naoki <songofacandy@gmail.com> | 2018-02-23 11:35:09 +0900 |
commit | fbaa1360be67672f855dd6337e4137f2edf7ade6 (patch) | |
tree | 520d94f8696e4713bcfc9918b81e0d56d9b27592 | |
parent | 3ca8eff31dd1a8a6c867f2d490f8ca26cb840124 (diff) | |
download | msgpack-python-fbaa1360be67672f855dd6337e4137f2edf7ade6.tar.gz |
Fix #285 again
-rw-r--r-- | msgpack/_unpacker.pyx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx index fb58490..3843e92 100644 --- a/msgpack/_unpacker.pyx +++ b/msgpack/_unpacker.pyx @@ -211,30 +211,15 @@ def unpackb(object packed, object object_hook=None, object list_hook=None, raise UnpackValueError("Unpack failed: error = %d" % (ret,)) -def unpack(object stream, object object_hook=None, object list_hook=None, - bint use_list=1, encoding=None, unicode_errors=None, - object_pairs_hook=None, ext_hook=ExtType, - Py_ssize_t max_str_len=2147483647, # 2**32-1 - Py_ssize_t max_bin_len=2147483647, - Py_ssize_t max_array_len=2147483647, - Py_ssize_t max_map_len=2147483647, - Py_ssize_t max_ext_len=2147483647): +def unpack(object stream, **kwargs): """ Unpack an object from `stream`. Raises `ValueError` when `stream` has extra bytes. - See :class:`Unpacker` for options. """ - return unpackb(stream.read(), use_list=use_list, - object_hook=object_hook, object_pairs_hook=object_pairs_hook, list_hook=list_hook, - encoding=encoding, unicode_errors=unicode_errors, ext_hook=ext_hook, - max_str_len=max_str_len, - max_bin_len=max_bin_len, - max_array_len=max_array_len, - max_map_len=max_map_len, - max_ext_len=max_ext_len, - ) + data = stream.read() + return unpackb(data, **kwargs) cdef class Unpacker(object): |