Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-20 12:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

six.BytesIO => io.BytesIO

Browse source
This commit is contained in:
INADA Naoki 2014-02-15 22:16:01 +09:00
parent 96d7d0edc6
commit dee2d87d41
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/test_pack.py
View file

@ -89,7 +89,7 @@ def testPackFloat():
assert packb(1.0, use_single_float=False) == b'\xcb' + struct.pack('>d', 1.0) assert packb(1.0, use_single_float=False) == b'\xcb' + struct.pack('>d', 1.0)
def testArraySize(sizes=[0, 5, 50, 1000]): def testArraySize(sizes=[0, 5, 50, 1000]):
bio = six.BytesIO() bio = BytesIO()
packer = Packer() packer = Packer()
for size in sizes: for size in sizes:
bio.write(packer.pack_array_header(size)) bio.write(packer.pack_array_header(size))
@ -108,7 +108,7 @@ def test_manualreset(sizes=[0, 5, 50, 1000]):
for i in range(size): for i in range(size):
packer.pack(i) packer.pack(i)
bio = six.BytesIO(packer.bytes()) bio = BytesIO(packer.bytes())
unpacker = Unpacker(bio, use_list=1) unpacker = Unpacker(bio, use_list=1)
for size in sizes: for size in sizes:
assert unpacker.unpack() == list(range(size)) assert unpacker.unpack() == list(range(size))
@ -117,7 +117,7 @@ def test_manualreset(sizes=[0, 5, 50, 1000]):
assert packer.bytes() == b'' assert packer.bytes() == b''
def testMapSize(sizes=[0, 5, 50, 1000]): def testMapSize(sizes=[0, 5, 50, 1000]):
bio = six.BytesIO() bio = BytesIO()
packer = Packer() packer = Packer()
for size in sizes: for size in sizes:
bio.write(packer.pack_map_header(size)) bio.write(packer.pack_map_header(size))

4
test/test_sequnpack.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# coding: utf-8 # coding: utf-8
import six import io
from msgpack import Unpacker, BufferFull from msgpack import Unpacker, BufferFull
from msgpack.exceptions import OutOfData from msgpack.exceptions import OutOfData
from pytest import raises from pytest import raises
@ -79,7 +79,7 @@ def test_readbytes():
assert unpacker.unpack() == ord(b'r') assert unpacker.unpack() == ord(b'r')
# Test buffer refill # Test buffer refill
unpacker = Unpacker(six.BytesIO(b'foobar'), read_size=3) unpacker = Unpacker(io.BytesIO(b'foobar'), read_size=3)
assert unpacker.unpack() == ord(b'f') assert unpacker.unpack() == ord(b'f')
assert unpacker.read_bytes(3) == b'oob' assert unpacker.read_bytes(3) == b'oob'
assert unpacker.unpack() == ord(b'a') assert unpacker.unpack() == ord(b'a')

12
test/test_unpack_raw.py
View file

@ -1,19 +1,19 @@
"""Tests for cases where the user seeks to obtain packed msgpack objects""" """Tests for cases where the user seeks to obtain packed msgpack objects"""
import six import io
from msgpack import Unpacker, packb from msgpack import Unpacker, packb
def test_write_bytes(): def test_write_bytes():
unpacker = Unpacker() unpacker = Unpacker()
unpacker.feed(b'abc') unpacker.feed(b'abc')
f = six.BytesIO() f = io.BytesIO()
assert unpacker.unpack(f.write) == ord('a') assert unpacker.unpack(f.write) == ord('a')
assert f.getvalue() == b'a' assert f.getvalue() == b'a'
f = six.BytesIO() f = io.BytesIO()
assert unpacker.skip(f.write) is None assert unpacker.skip(f.write) is None
assert f.getvalue() == b'b' assert f.getvalue() == b'b'
f = six.BytesIO() f = io.BytesIO()
assert unpacker.skip() is None assert unpacker.skip() is None
assert f.getvalue() == b'' assert f.getvalue() == b''
@ -21,9 +21,9 @@ def test_write_bytes():
def test_write_bytes_multi_buffer(): def test_write_bytes_multi_buffer():
long_val = (5) * 100 long_val = (5) * 100
expected = packb(long_val) expected = packb(long_val)
unpacker = Unpacker(six.BytesIO(expected), read_size=3, max_buffer_size=3) unpacker = Unpacker(io.BytesIO(expected), read_size=3, max_buffer_size=3)
f = six.BytesIO() f = io.BytesIO()
unpacked = unpacker.unpack(f.write) unpacked = unpacker.unpack(f.write)
assert unpacked == long_val assert unpacked == long_val
assert f.getvalue() == expected assert f.getvalue() == expected