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

removed MsgpackBaseException

Browse source
This commit is contained in:
palaviv 2016-02-12 15:39:50 +02:00
parent 1183eff688
commit e15085db03
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
msgpack/exceptions.py
View file

@ -1,8 +1,4 @@
class MsgpackBaseException(Exception): class UnpackException(Exception):
pass
class UnpackException(MsgpackBaseException):
pass pass
@ -26,9 +22,11 @@ class ExtraData(ValueError):
def __str__(self): def __str__(self):
return "unpack(b) received extra data." return "unpack(b) received extra data."
class PackException(MsgpackBaseException):
class PackException(Exception):
pass pass
class PackValueError(PackException, ValueError): class PackValueError(PackException, ValueError):
pass pass

18
test/test_limits.py
View file

@ -4,11 +4,11 @@ from __future__ import absolute_import, division, print_function, unicode_litera
import pytest import pytest
from msgpack import packb, unpackb, Packer, Unpacker, ExtType, PackException, PackOverflowError, PackValueError from msgpack import packb, unpackb, Packer, Unpacker, ExtType, PackException, PackOverflowError, PackValueError
from msgpack import UnpackValueError, UnpackException, MsgpackBaseException from msgpack import UnpackValueError, UnpackException
@pytest.mark.parametrize("expected_exception", [OverflowError, ValueError, PackOverflowError, @pytest.mark.parametrize("expected_exception", [OverflowError, ValueError, PackOverflowError,
PackException, PackValueError, MsgpackBaseException]) PackException, PackValueError])
def test_integer(expected_exception): def test_integer(expected_exception):
x = -(2 ** 63) x = -(2 ** 63)
assert unpackb(packb(x)) == x assert unpackb(packb(x)) == x
@ -21,7 +21,7 @@ def test_integer(expected_exception):
packb(x+1) packb(x+1)
@pytest.mark.parametrize("expected_exception", [ValueError, PackException, PackValueError, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, PackException, PackValueError])
def test_array_header(expected_exception): def test_array_header(expected_exception):
packer = Packer() packer = Packer()
packer.pack_array_header(2**32-1) packer.pack_array_header(2**32-1)
@ -29,7 +29,7 @@ def test_array_header(expected_exception):
packer.pack_array_header(2**32) packer.pack_array_header(2**32)
@pytest.mark.parametrize("expected_exception", [ValueError, PackException, PackValueError, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, PackException, PackValueError])
def test_map_header(expected_exception): def test_map_header(expected_exception):
packer = Packer() packer = Packer()
packer.pack_map_header(2**32-1) packer.pack_map_header(2**32-1)
@ -37,7 +37,7 @@ def test_map_header(expected_exception):
packer.pack_array_header(2**32) packer.pack_array_header(2**32)
@pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException])
def test_max_str_len(expected_exception): def test_max_str_len(expected_exception):
d = 'x' * 3 d = 'x' * 3
packed = packb(d) packed = packb(d)
@ -52,7 +52,7 @@ def test_max_str_len(expected_exception):
unpacker.unpack() unpacker.unpack()
@pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException])
def test_max_bin_len(expected_exception): def test_max_bin_len(expected_exception):
d = b'x' * 3 d = b'x' * 3
packed = packb(d, use_bin_type=True) packed = packb(d, use_bin_type=True)
@ -67,7 +67,7 @@ def test_max_bin_len(expected_exception):
unpacker.unpack() unpacker.unpack()
@pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException])
def test_max_array_len(expected_exception): def test_max_array_len(expected_exception):
d = [1,2,3] d = [1,2,3]
packed = packb(d) packed = packb(d)
@ -82,7 +82,7 @@ def test_max_array_len(expected_exception):
unpacker.unpack() unpacker.unpack()
@pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException])
def test_max_map_len(expected_exception): def test_max_map_len(expected_exception):
d = {1: 2, 3: 4, 5: 6} d = {1: 2, 3: 4, 5: 6}
packed = packb(d) packed = packb(d)
@ -97,7 +97,7 @@ def test_max_map_len(expected_exception):
unpacker.unpack() unpacker.unpack()
@pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException, MsgpackBaseException]) @pytest.mark.parametrize("expected_exception", [ValueError, UnpackValueError, UnpackException])
def test_max_ext_len(expected_exception): def test_max_ext_len(expected_exception):
d = ExtType(42, b"abc") d = ExtType(42, b"abc")
packed = packb(d) packed = packb(d)