Add raw_as_bytes option to Unpacker. (#265)

4 files changed, 20 insertions, 24 deletions

diff --git a/test/test_limits.py b/test/test_limits.py
index 197ef46..3febc30 100644
--- a/test/test_limits.py
+++ b/test/test_limits.py
@@ -39,11 +39,11 @@ def test_max_str_len():
     d = 'x' * 3
     packed = packb(d)
 
-    unpacker = Unpacker(max_str_len=3, encoding='utf-8')
+    unpacker = Unpacker(max_str_len=3, raw_as_bytes=False)
     unpacker.feed(packed)
     assert unpacker.unpack() == d
 
-    unpacker = Unpacker(max_str_len=2, encoding='utf-8')
+    unpacker = Unpacker(max_str_len=2, raw_as_bytes=False)
     with pytest.raises(UnpackValueError):
         unpacker.feed(packed)
         unpacker.unpack()
diff --git a/test/test_pack.py b/test/test_pack.py
index ac93103..29f5887 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -31,14 +31,14 @@ def testPack():
 def testPackUnicode():
     test_data = ["", "abcd", ["defgh"], "Русский текст"]
     for td in test_data:
-        re = unpackb(packb(td, encoding='utf-8'), use_list=1, encoding='utf-8')
+        re = unpackb(packb(td), use_list=1, raw_as_bytes=False)
         assert re == td
-        packer = Packer(encoding='utf-8')
+        packer = Packer()
         data = packer.pack(td)
-        re = Unpacker(BytesIO(data), encoding=str('utf-8'), use_list=1).unpack()
+        re = Unpacker(BytesIO(data), raw_as_bytes=False, use_list=1).unpack()
         assert re == td
 
-def testPackUTF32():
+def testPackUTF32():  # deprecated
     try:
         test_data = [
             "",
@@ -66,26 +66,22 @@ def testPackByteArrays():
     for td in test_data:
         check(td)
 
-def testIgnoreUnicodeErrors():
+def testIgnoreUnicodeErrors(): # deprecated
     re = unpackb(packb(b'abc\xeddef'), encoding='utf-8', unicode_errors='ignore', use_list=1)
     assert re == "abcdef"
 
 def testStrictUnicodeUnpack():
     with raises(UnicodeDecodeError):
-        unpackb(packb(b'abc\xeddef'), encoding='utf-8', use_list=1)
+        unpackb(packb(b'abc\xeddef'), raw_as_bytes=False, use_list=1)
 
-def testStrictUnicodePack():
+def testStrictUnicodePack():  # deprecated
     with raises(UnicodeEncodeError):
         packb("abc\xeddef", encoding='ascii', unicode_errors='strict')
 
-def testIgnoreErrorsPack():
-    re = unpackb(packb("abcФФФdef", encoding='ascii', unicode_errors='ignore'), encoding='utf-8', use_list=1)
+def testIgnoreErrorsPack():  # deprecated
+    re = unpackb(packb("abcФФФdef", encoding='ascii', unicode_errors='ignore'), raw_as_bytes=False, use_list=1)
     assert re == "abcdef"
 
-def testNoEncoding():
-    with raises(TypeError):
-        packb("abc", encoding=None)
-
 def testDecodeBinary():
     re = unpackb(packb(b"abc"), encoding=None, use_list=1)
     assert re == b"abc"
diff --git a/test/test_stricttype.py b/test/test_stricttype.py
index 0f865c8..13239f1 100644
--- a/test/test_stricttype.py
+++ b/test/test_stricttype.py
@@ -11,7 +11,7 @@ def test_namedtuple():
             return dict(o._asdict())
         raise TypeError('Unsupported type %s' % (type(o),))
     packed = packb(T(1, 42), strict_types=True, use_bin_type=True, default=default)
-    unpacked = unpackb(packed, encoding='utf-8')
+    unpacked = unpackb(packed, raw_as_bytes=False)
     assert unpacked == {'foo': 1, 'bar': 42}
 
 
@@ -32,7 +32,7 @@ def test_tuple():
         return o
 
     data = packb(t, strict_types=True, use_bin_type=True, default=default)
-    expected = unpackb(data, encoding='utf-8', object_hook=convert)
+    expected = unpackb(data, raw_as_bytes=False, object_hook=convert)
 
     assert expected == t
 
@@ -53,10 +53,10 @@ def test_tuple_ext():
     def convert(code, payload):
         if code == MSGPACK_EXT_TYPE_TUPLE:
             # Unpack and convert to tuple
-            return tuple(unpackb(payload, encoding='utf-8', ext_hook=convert))
+            return tuple(unpackb(payload, raw_as_bytes=False, ext_hook=convert))
         raise ValueError('Unknown Ext code {}'.format(code))
 
     data = packb(t, strict_types=True, use_bin_type=True, default=default)
-    expected = unpackb(data, encoding='utf-8', ext_hook=convert)
+    expected = unpackb(data, raw_as_bytes=False, ext_hook=convert)
 
     assert expected == t
diff --git a/test/test_unpack.py b/test/test_unpack.py
index c0d711c..143f999 100644
--- a/test/test_unpack.py
+++ b/test/test_unpack.py
@@ -47,8 +47,8 @@ def test_unpacker_ext_hook():
     class MyUnpacker(Unpacker):
 
         def __init__(self):
-            super(MyUnpacker, self).__init__(ext_hook=self._hook,
-                                             encoding='utf-8')
+            super(MyUnpacker, self).__init__(
+                ext_hook=self._hook, raw_as_bytes=False)
 
         def _hook(self, code, data):
             if code == 1:
@@ -57,11 +57,11 @@ def test_unpacker_ext_hook():
                 return ExtType(code, data)
 
     unpacker = MyUnpacker()
-    unpacker.feed(packb({'a': 1}, encoding='utf-8'))
+    unpacker.feed(packb({'a': 1}))
     assert unpacker.unpack() == {'a': 1}
-    unpacker.feed(packb({'a': ExtType(1, b'123')}, encoding='utf-8'))
+    unpacker.feed(packb({'a': ExtType(1, b'123')}))
     assert unpacker.unpack() == {'a': 123}
-    unpacker.feed(packb({'a': ExtType(2, b'321')}, encoding='utf-8'))
+    unpacker.feed(packb({'a': ExtType(2, b'321')}))
     assert unpacker.unpack() == {'a': ExtType(2, b'321')}