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

Remove six completely.

Browse source
This commit is contained in:
INADA Naoki 2014-02-15 22:36:52 +09:00
parent 63eab502df
commit 0c22e775c9
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/test_pack.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# coding: utf-8 # coding: utf-8
from __future__ import absolute_import, division, print_function, unicode_literals
import six
import struct import struct
from pytest import raises, xfail from pytest import raises, xfail
@ -28,24 +28,22 @@ def testPack():
check(td) check(td)
def testPackUnicode(): def testPackUnicode():
test_data = [ test_data = ["", "abcd", ["defgh"], "Русский текст"]
six.u(""), six.u("abcd"), [six.u("defgh")], six.u("Русский текст"),
]
for td in test_data: for td in test_data:
re = unpackb(packb(td, encoding='utf-8'), use_list=1, encoding='utf-8') re = unpackb(packb(td, encoding='utf-8'), use_list=1, encoding='utf-8')
assert re == td assert re == td
packer = Packer(encoding='utf-8') packer = Packer(encoding='utf-8')
data = packer.pack(td) data = packer.pack(td)
re = Unpacker(BytesIO(data), encoding='utf-8', use_list=1).unpack() re = Unpacker(BytesIO(data), encoding=str('utf-8'), use_list=1).unpack()
assert re == td assert re == td
def testPackUTF32(): def testPackUTF32():
try: try:
test_data = [ test_data = [
six.u(""), "",
six.u("abcd"), "abcd",
[six.u("defgh")], ["defgh"],
six.u("Русский текст"), "Русский текст",
] ]
for td in test_data: for td in test_data:
re = unpackb(packb(td, encoding='utf-32'), use_list=1, encoding='utf-32') re = unpackb(packb(td, encoding='utf-32'), use_list=1, encoding='utf-32')
@ -70,23 +68,23 @@ def testStrictUnicodeUnpack():
def testStrictUnicodePack(): def testStrictUnicodePack():
with raises(UnicodeEncodeError): with raises(UnicodeEncodeError):
packb(six.u("abc\xeddef"), encoding='ascii', unicode_errors='strict') packb("abc\xeddef", encoding='ascii', unicode_errors='strict')
def testIgnoreErrorsPack(): def testIgnoreErrorsPack():
re = unpackb(packb(six.u("abcФФФdef"), encoding='ascii', unicode_errors='ignore'), encoding='utf-8', use_list=1) re = unpackb(packb("abcФФФdef", encoding='ascii', unicode_errors='ignore'), encoding='utf-8', use_list=1)
assert re == six.u("abcdef") assert re == "abcdef"
def testNoEncoding(): def testNoEncoding():
with raises(TypeError): with raises(TypeError):
packb(six.u("abc"), encoding=None) packb("abc", encoding=None)
def testDecodeBinary(): def testDecodeBinary():
re = unpackb(packb("abc"), encoding=None, use_list=1) re = unpackb(packb(b"abc"), encoding=None, use_list=1)
assert re == b"abc" assert re == b"abc"
def testPackFloat(): def testPackFloat():
assert packb(1.0, use_single_float=True) == b'\xca' + struct.pack('>f', 1.0) assert packb(1.0, use_single_float=True) == b'\xca' + struct.pack(str('>f'), 1.0)
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(str('>d'), 1.0)
def testArraySize(sizes=[0, 5, 50, 1000]): def testArraySize(sizes=[0, 5, 50, 1000]):
bio = BytesIO() bio = BytesIO()

1
tox.ini
View file

@ -4,6 +4,5 @@ envlist = py26,py27,py32,py33,pypy
[testenv] [testenv]
deps= deps=
pytest pytest
six
commands=py.test test commands=py.test test