unify tests for py2 and py3

6 files changed, 84 insertions, 87 deletions

diff --git a/test/test_buffer.py b/test/test_buffer.py
index ce7a72d..01310a0 100644
--- a/test/test_buffer.py
+++ b/test/test_buffer.py
@@ -7,10 +7,10 @@ from msgpack import packb, unpackb
 
 def test_unpack_buffer():
     from array import array
-    buf = array('c')
+    buf = array('b')
     buf.fromstring(packb(('foo', 'bar')))
     obj = unpackb(buf)
-    assert_equal(('foo', 'bar'), obj)
+    assert_equal((b'foo', b'bar'), obj)
 
 if __name__ == '__main__':
     main()
diff --git a/test/test_case.py b/test/test_case.py
index 1cbc494..2f42316 100644
--- a/test/test_case.py
+++ b/test/test_case.py
@@ -40,7 +40,7 @@ def test_9():
 
 
 def check_raw(overhead, num):
-    check(num + overhead, " " * num)
+    check(num + overhead, b" " * num)
 
 def test_fixraw():
     check_raw(1, 0)
@@ -75,31 +75,31 @@ def match(obj, buf):
 
 def test_match():
     cases = [
-        (None, '\xc0'),
-        (False, '\xc2'),
-        (True, '\xc3'),
-        (0, '\x00'),
-        (127, '\x7f'),
-        (128, '\xcc\x80'),
-        (256, '\xcd\x01\x00'),
-        (-1, '\xff'),
-        (-33, '\xd0\xdf'),
-        (-129, '\xd1\xff\x7f'),
-        ({1:1}, '\x81\x01\x01'),
-        (1.0, "\xcb\x3f\xf0\x00\x00\x00\x00\x00\x00"),
-        ((), '\x90'),
-        (tuple(range(15)),"\x9f\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e"),
-        (tuple(range(16)),"\xdc\x00\x10\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"),
-        ({}, '\x80'),
-        (dict([(x,x) for x in range(15)]), '\x8f\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e'),
-        (dict([(x,x) for x in range(16)]), '\xde\x00\x10\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e\x0f\x0f'),
+        (None, b'\xc0'),
+        (False, b'\xc2'),
+        (True, b'\xc3'),
+        (0, b'\x00'),
+        (127, b'\x7f'),
+        (128, b'\xcc\x80'),
+        (256, b'\xcd\x01\x00'),
+        (-1, b'\xff'),
+        (-33, b'\xd0\xdf'),
+        (-129, b'\xd1\xff\x7f'),
+        ({1:1}, b'\x81\x01\x01'),
+        (1.0, b"\xcb\x3f\xf0\x00\x00\x00\x00\x00\x00"),
+        ((), b'\x90'),
+        (tuple(range(15)),b"\x9f\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e"),
+        (tuple(range(16)),b"\xdc\x00\x10\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"),
+        ({}, b'\x80'),
+        (dict([(x,x) for x in range(15)]), b'\x8f\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e'),
+        (dict([(x,x) for x in range(16)]), b'\xde\x00\x10\x00\x00\x01\x01\x02\x02\x03\x03\x04\x04\x05\x05\x06\x06\x07\x07\x08\x08\t\t\n\n\x0b\x0b\x0c\x0c\r\r\x0e\x0e\x0f\x0f'),
         ]
 
     for v, p in cases:
         match(v, p)
 
 def test_unicode():
-    assert_equal('foobar', unpacks(packs(u'foobar')))
+    assert_equal(b'foobar', unpacks(packs('foobar')))
 
 if __name__ == '__main__':
     main()
diff --git a/test/test_format.py b/test/test_format.py
index 562ef54..022e680 100644
--- a/test/test_format.py
+++ b/test/test_format.py
@@ -9,65 +9,65 @@ def check(src, should):
     assert_equal(unpacks(src), should)
 
 def testSimpleValue():
-    check("\x93\xc0\xc2\xc3", 
+    check(b"\x93\xc0\xc2\xc3", 
             (None, False, True,))
 
 def testFixnum():
-    check("\x92\x93\x00\x40\x7f\x93\xe0\xf0\xff",
+    check(b"\x92\x93\x00\x40\x7f\x93\xe0\xf0\xff",
           ((0,64,127,), (-32,-16,-1,),)
           )
 
 def testFixArray():
-    check("\x92\x90\x91\x91\xc0",
+    check(b"\x92\x90\x91\x91\xc0",
           ((),((None,),),),
           )
 
 def testFixRaw():
-    check("\x94\xa0\xa1a\xa2bc\xa3def",
-          ("", "a", "bc", "def",),
+    check(b"\x94\xa0\xa1a\xa2bc\xa3def",
+          (b"", b"a", b"bc", b"def",),
           )
 
 def testFixMap():
     check(
-          "\x82\xc2\x81\xc0\xc0\xc3\x81\xc0\x80",
+          b"\x82\xc2\x81\xc0\xc0\xc3\x81\xc0\x80",
           {False: {None: None}, True:{None:{}}},
           )
 
 def testUnsignedInt():
     check(
-          "\x99\xcc\x00\xcc\x80\xcc\xff\xcd\x00\x00\xcd\x80\x00"
-          "\xcd\xff\xff\xce\x00\x00\x00\x00\xce\x80\x00\x00\x00"
-          "\xce\xff\xff\xff\xff",
+          b"\x99\xcc\x00\xcc\x80\xcc\xff\xcd\x00\x00\xcd\x80\x00"
+          b"\xcd\xff\xff\xce\x00\x00\x00\x00\xce\x80\x00\x00\x00"
+          b"\xce\xff\xff\xff\xff",
           (0, 128, 255, 0, 32768, 65535, 0, 2147483648, 4294967295,),
           )
 
 def testSignedInt():
-    check("\x99\xd0\x00\xd0\x80\xd0\xff\xd1\x00\x00\xd1\x80\x00"
-          "\xd1\xff\xff\xd2\x00\x00\x00\x00\xd2\x80\x00\x00\x00"
-          "\xd2\xff\xff\xff\xff",
+    check(b"\x99\xd0\x00\xd0\x80\xd0\xff\xd1\x00\x00\xd1\x80\x00"
+          b"\xd1\xff\xff\xd2\x00\x00\x00\x00\xd2\x80\x00\x00\x00"
+          b"\xd2\xff\xff\xff\xff",
           (0, -128, -1, 0, -32768, -1, 0, -2147483648, -1,))
 
 def testRaw():
-    check("\x96\xda\x00\x00\xda\x00\x01a\xda\x00\x02ab\xdb\x00\x00"
-        "\x00\x00\xdb\x00\x00\x00\x01a\xdb\x00\x00\x00\x02ab",
-        ("", "a", "ab", "", "a", "ab"))
+    check(b"\x96\xda\x00\x00\xda\x00\x01a\xda\x00\x02ab\xdb\x00\x00"
+        b"\x00\x00\xdb\x00\x00\x00\x01a\xdb\x00\x00\x00\x02ab",
+        (b"", b"a", b"ab", b"", b"a", b"ab"))
 
 def testArray():
-    check("\x96\xdc\x00\x00\xdc\x00\x01\xc0\xdc\x00\x02\xc2\xc3\xdd\x00"
-        "\x00\x00\x00\xdd\x00\x00\x00\x01\xc0\xdd\x00\x00\x00\x02"
-        "\xc2\xc3",
+    check(b"\x96\xdc\x00\x00\xdc\x00\x01\xc0\xdc\x00\x02\xc2\xc3\xdd\x00"
+        b"\x00\x00\x00\xdd\x00\x00\x00\x01\xc0\xdd\x00\x00\x00\x02"
+        b"\xc2\xc3",
         ((), (None,), (False,True), (), (None,), (False,True))
         )
 
 def testMap():
     check(
-        "\x96"
-            "\xde\x00\x00"
-            "\xde\x00\x01\xc0\xc2"
-            "\xde\x00\x02\xc0\xc2\xc3\xc2"
-            "\xdf\x00\x00\x00\x00"
-            "\xdf\x00\x00\x00\x01\xc0\xc2"
-            "\xdf\x00\x00\x00\x02\xc0\xc2\xc3\xc2",
+        b"\x96"
+            b"\xde\x00\x00"
+            b"\xde\x00\x01\xc0\xc2"
+            b"\xde\x00\x02\xc0\xc2\xc3\xc2"
+            b"\xdf\x00\x00\x00\x00"
+            b"\xdf\x00\x00\x00\x01\xc0\xc2"
+            b"\xdf\x00\x00\x00\x02\xc0\xc2\xc3\xc2",
         ({}, {None: False}, {True: False, None: False}, {},
             {None: False}, {True: False, None: False}))
 
diff --git a/test/test_obj.py b/test/test_obj.py
index 0eebe7b..6357cfc 100644
--- a/test/test_obj.py
+++ b/test/test_obj.py
@@ -7,22 +7,22 @@ from nose.tools import *
 from msgpack import packs, unpacks
 
 def _decode_complex(obj):
-    if '__complex__' in obj:
-        return complex(obj['real'], obj['imag'])
+    if b'__complex__' in obj:
+        return complex(obj[b'real'], obj[b'imag'])
     return obj
 
 def _encode_complex(obj):
     if isinstance(obj, complex):
-        return {'__complex__': True, 'real': 1, 'imag': 2}
+        return {b'__complex__': True, b'real': 1, b'imag': 2}
     return obj
 
 def test_encode_hook():
     packed = packs([3, 1+2j], default=_encode_complex)
     unpacked = unpacks(packed)
-    eq_(unpacked[1], {'__complex__': True, 'real': 1, 'imag': 2})
+    eq_(unpacked[1], {b'__complex__': True, b'real': 1, b'imag': 2})
 
 def test_decode_hook():
-    packed = packs([3, {'__complex__': True, 'real': 1, 'imag': 2}])
+    packed = packs([3, {b'__complex__': True, b'real': 1, b'imag': 2}])
     unpacked = unpacks(packed, object_hook=_decode_complex)
     eq_(unpacked[1], 1+2j)
 
@@ -40,7 +40,4 @@ def test_array_hook():
     eq_(unpacked, '123')
 
 if __name__ == '__main__':
-    test_decode_hook()
-    test_encode_hook()
-    test_bad_hook()
-    test_array_hook()
+    main()
diff --git a/test/test_pack.py b/test/test_pack.py
index 2e1ac22..480af28 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -5,9 +5,9 @@ from nose import main
 from nose.tools import *
 from nose.plugins.skip import SkipTest
 
-from msgpack import packs, unpacks, Packer, Unpacker
+from msgpack import packs, unpacks, Unpacker, Packer
 
-from StringIO import StringIO
+from io import BytesIO
 
 def check(data):
     re = unpacks(packs(data))
@@ -18,7 +18,7 @@ def testPack():
             0, 1, 127, 128, 255, 256, 65535, 65536,
             -1, -32, -33, -128, -129, -32768, -32769,
             1.0,
-        "", "a", "a"*31, "a"*32,
+        b"", b"a", b"a"*31, b"a"*32,
         None, True, False,
         (), ((),), ((), None,),
         {None: 0},
@@ -29,20 +29,20 @@ def testPack():
 
 def testPackUnicode():
     test_data = [
-        u"", u"abcd", (u"defgh",), u"Русский текст",
+        "", "abcd", ("defgh",), "Русский текст",
         ]
     for td in test_data:
         re = unpacks(packs(td, encoding='utf-8'), encoding='utf-8')
         assert_equal(re, td)
         packer = Packer(encoding='utf-8')
         data = packer.pack(td)
-        re = Unpacker(StringIO(data), encoding='utf-8').unpack()
+        re = Unpacker(BytesIO(data), encoding='utf-8').unpack()
         assert_equal(re, td)
 
 def testPackUTF32():
     try:
         test_data = [
-            u"", u"abcd", (u"defgh",), u"Русский текст",
+            "", "abcd", ("defgh",), "Русский текст",
             ]
         for td in test_data:
             re = unpacks(packs(td, encoding='utf-32'), encoding='utf-32')
@@ -52,37 +52,35 @@ def testPackUTF32():
 
 def testPackBytes():
     test_data = [
-        "", "abcd", ("defgh",),
+        b"", b"abcd", (b"defgh",),
         ]
     for td in test_data:
         check(td)
 
 def testIgnoreUnicodeErrors():
-    re = unpacks(packs('abc\xeddef'),
-        encoding='ascii', unicode_errors='ignore')
+    re = unpacks(packs(b'abc\xeddef'),
+        encoding='utf-8', unicode_errors='ignore')
     assert_equal(re, "abcdef")
 
 @raises(UnicodeDecodeError)
 def testStrictUnicodeUnpack():
-    unpacks(packs('abc\xeddef'), encoding='utf-8')
+    unpacks(packs(b'abc\xeddef'), encoding='utf-8')
 
 @raises(UnicodeEncodeError)
 def testStrictUnicodePack():
-    packs(u"abc\xeddef", encoding='ascii', unicode_errors='strict')
+    packs("abc\xeddef", encoding='ascii', unicode_errors='strict')
 
 def testIgnoreErrorsPack():
-    re = unpacks(
-            packs(u"abcФФФdef", encoding='ascii', unicode_errors='ignore'),
-            encoding='utf-8')
-    assert_equal(re, u"abcdef")
+    re = unpacks(packs("abcФФФdef", encoding='ascii', unicode_errors='ignore'), encoding='utf-8')
+    assert_equal(re, "abcdef")
 
 @raises(TypeError)
 def testNoEncoding():
-    packs(u"abc", encoding=None)
+    packs("abc", encoding=None)
 
 def testDecodeBinary():
-    re = unpacks(packs(u"abc"), encoding=None)
-    assert_equal(re, "abc")
+    re = unpacks(packs("abc"), encoding=None)
+    assert_equal(re, b"abc")
 
 if __name__ == '__main__':
     main()
diff --git a/test/test_sequnpack.py b/test/test_sequnpack.py
index d61be23..5fd377c 100644
--- a/test/test_sequnpack.py
+++ b/test/test_sequnpack.py
@@ -1,33 +1,35 @@
 #!/usr/bin/env python
 # coding: utf-8
 
+
+
 from msgpack import Unpacker
 
 def test_foobar():
     unpacker = Unpacker(read_size=3)
-    unpacker.feed('foobar')
-    assert unpacker.unpack() == ord('f')
-    assert unpacker.unpack() == ord('o')
-    assert unpacker.unpack() == ord('o')
-    assert unpacker.unpack() == ord('b')
-    assert unpacker.unpack() == ord('a')
-    assert unpacker.unpack() == ord('r')
+    unpacker.feed(b'foobar')
+    assert unpacker.unpack() == ord(b'f')
+    assert unpacker.unpack() == ord(b'o')
+    assert unpacker.unpack() == ord(b'o')
+    assert unpacker.unpack() == ord(b'b')
+    assert unpacker.unpack() == ord(b'a')
+    assert unpacker.unpack() == ord(b'r')
     try:
         o = unpacker.unpack()
-        print "Oops!", o
+        print(("Oops!", o))
         assert 0
     except StopIteration:
         assert 1
     else:
         assert 0
-    unpacker.feed('foo')
-    unpacker.feed('bar')
+    unpacker.feed(b'foo')
+    unpacker.feed(b'bar')
 
     k = 0
-    for o, e in zip(unpacker, 'foobarbaz'):
-        assert o == ord(e)
+    for o, e in zip(unpacker, b'foobarbaz'):
+        assert o == e
         k += 1
-    assert k == len('foobar')
+    assert k == len(b'foobar')
 
 if __name__ == '__main__':
     test_foobar()