summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2015-08-24 03:16:24 +0900
committerINADA Naoki <methane@users.noreply.github.com>2015-08-24 03:16:24 +0900
commitaa209ab1e9fd4ce97c0073aeecedfd6fd91c4c4d (patch)
tree00851ed01c61b6e244d088da41073a63d9f40ff8
parentd816aa80402dcce8fa806d4d43d0c087d86d6152 (diff)
parent4eb4c7a9940a5424ded190c1e0b9a0bb466047fb (diff)
downloadmsgpack-python-aa209ab1e9fd4ce97c0073aeecedfd6fd91c4c4d.tar.gz
Merge pull request #143 from emulbreh/pass-ext-hook
Accept ext_hook for unpack()
-rw-r--r--msgpack/_unpacker.pyx4
1 files changed, 2 insertions, 2 deletions
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index f5e7d95..d53f724 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -147,7 +147,7 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
def unpack(object stream, object object_hook=None, object list_hook=None,
bint use_list=1, encoding=None, unicode_errors="strict",
- object_pairs_hook=None,
+ object_pairs_hook=None, ext_hook=ExtType
):
"""
Unpack an object from `stream`.
@@ -158,7 +158,7 @@ def unpack(object stream, object object_hook=None, object list_hook=None,
"""
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,
+ encoding=encoding, unicode_errors=unicode_errors, ext_hook=ext_hook
)