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

Merge pull request #107 from msgpack/fix-build

Browse source 
Fix build and tests.
This commit is contained in:
INADA Naoki 2014-08-31 02:36:32 +09:00
commit 5d6481dcbb
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
msgpack/unpack.h
View file

@ -55,15 +55,7 @@ static inline int unpack_callback_uint8(unpack_user* u, uint8_t d, msgpack_unpac
static inline int unpack_callback_uint32(unpack_user* u, uint32_t d, msgpack_unpack_object* o)
{
PyObject *p;
#if UINT32_MAX > LONG_MAX
if (d > LONG_MAX) {
p = PyLong_FromUnsignedLong((unsigned long)d);
} else
#endif
{
p = PyInt_FromUnsignedLong((long)d);
}
PyObject *p = PyInt_FromSize_t((size_t)d);
if (!p)
return -1;
*o = p;

4
test/test_limits.py
View file

@ -21,14 +21,14 @@ def test_integer():
def test_array_header():
packer = Packer()
packer.pack_array_header(2**32-1)
with pytest.raises(ValueError):
with pytest.raises((OverflowError, ValueError)):
packer.pack_array_header(2**32)
def test_map_header():
packer = Packer()
packer.pack_map_header(2**32-1)
with pytest.raises(ValueError):
with pytest.raises((OverflowError, ValueError)):
packer.pack_array_header(2**32)