Revert "Move unpack() from each implementation to __init__." (msgpack#288)

methane · web-flow · commit 3ca8eff31dd1 · 2018-02-23T11:33:26.000+09:00
This reverts commit da902f9.
diff --git a/msgpack/__init__.py b/msgpack/__init__.py
@@ -19,13 +19,13 @@ def __new__(cls, code, data):
 
 import os
 if os.environ.get('MSGPACK_PUREPYTHON'):
-    from msgpack.fallback import Packer, unpackb, Unpacker
+    from msgpack.fallback import Packer, unpack, unpackb, Unpacker
 else:
     try:
         from msgpack._packer import Packer
-        from msgpack._unpacker import unpackb, Unpacker
+        from msgpack._unpacker import unpack, unpackb, Unpacker
     except ImportError:
-        from msgpack.fallback import Packer, unpackb, Unpacker
+        from msgpack.fallback import Packer, unpack, unpackb, Unpacker
 
 
 def pack(o, stream, **kwargs):
@@ -46,17 +46,6 @@ def packb(o, **kwargs):
     """
     return Packer(**kwargs).pack(o)
 
-
-def unpack(stream, **kwargs):
-    """
-    Unpack an object from `stream`.
-
-    Raises `ExtraData` when `packed` contains extra bytes.
-    See :class:`Unpacker` for options.
-    """
-    return unpackb(stream.read(), **kwargs)
-
-
 # alias for compatibility to simplejson/marshal/pickle.
 load = unpack
 loads = unpackb
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
@@ -211,6 +211,32 @@ 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):
+    """
+    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,
+                   )
+
+
 cdef class Unpacker(object):
     """Streaming unpacker.
 
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
@@ -100,6 +100,16 @@ def _get_data_from_buffer(obj):
     return view
 
 
+def unpack(stream, **kwargs):
+    """
+    Unpack an object from `stream`.
+
+    Raises `ExtraData` when `packed` contains extra bytes.
+    See :class:`Unpacker` for options.
+    """
+    data = stream.read()
+    return unpackb(data, **kwargs)
+
 
 def unpackb(packed, **kwargs):
     """
