IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:jparyani/pycapnp into develop

Browse Source
This commit is contained in:
Jason Paryani
2017-11-30 22:05:33 -08:00
parent 0242ba2d33 0dcc171acc
commit 6831626a8e
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
capnp/lib/capnp.pyx
View File

@@ -15,7 +15,7 @@ from libc.stdlib cimport malloc, free
from libc.string cimport memcpy from libc.string cimport memcpy
from cython.operator cimport dereference as deref from cython.operator cimport dereference as deref
from cpython.exc cimport PyErr_Clear from cpython.exc cimport PyErr_Clear
from cpython cimport Py_buffer from cpython cimport Py_buffer, PyObject_CheckBuffer
from cpython.buffer cimport PyBUF_SIMPLE from cpython.buffer cimport PyBUF_SIMPLE
from types import ModuleType as _ModuleType from types import ModuleType as _ModuleType
@@ -31,7 +31,6 @@ import threading as _threading
import socket as _socket import socket as _socket
import random as _random import random as _random
import collections as _collections import collections as _collections
import mmap as _mmap
_CAPNP_VERSION_MAJOR = capnp.CAPNP_VERSION_MAJOR _CAPNP_VERSION_MAJOR = capnp.CAPNP_VERSION_MAJOR
_CAPNP_VERSION_MINOR = capnp.CAPNP_VERSION_MINOR _CAPNP_VERSION_MINOR = capnp.CAPNP_VERSION_MINOR
@@ -3756,11 +3755,7 @@ cdef class _FlatArrayMessageReader(_MessageReader):
raise ValueError("input length must be a multiple of eight bytes") raise ValueError("input length must be a multiple of eight bytes")
cdef char * ptr cdef char * ptr
if type(buf) == _mmap.mmap: if isinstance(buf, bytes):
view = _BufferView(buf)
ptr = view.buf
self._object_to_pin = view
else:
ptr = buf ptr = buf
if (<uintptr_t>ptr) % 8 != 0: if (<uintptr_t>ptr) % 8 != 0:
aligned = _AlignedBuffer(buf) aligned = _AlignedBuffer(buf)
@@ -3768,6 +3763,12 @@ cdef class _FlatArrayMessageReader(_MessageReader):
self._object_to_pin = aligned self._object_to_pin = aligned
else: else:
self._object_to_pin = buf self._object_to_pin = buf
elif PyObject_CheckBuffer(buf):
view = _BufferView(buf)
ptr = view.buf
self._object_to_pin = view
else:
raise TypeError('expected buffer-like object in FlatArrayMessageReader')
self.thisptr = new schema_cpp.FlatArrayMessageReader( self.thisptr = new schema_cpp.FlatArrayMessageReader(
schema_cpp.WordArrayPtr(<schema_cpp.word*>ptr, sz//8), schema_cpp.WordArrayPtr(<schema_cpp.word*>ptr, sz//8),

14
test/test_serialization.py
View File

@@ -65,6 +65,20 @@ def test_roundtrip_bytes_mmap(all_types):
msg = all_types.TestAllTypes.from_bytes(memory) msg = all_types.TestAllTypes.from_bytes(memory)
test_regression.check_all_types(msg) test_regression.check_all_types(msg)
@pytest.mark.skipif(sys.version_info[0] < 3, reason="memoryview is a builtin on Python 3")
def test_roundtrip_bytes_buffer(all_types):
msg = all_types.TestAllTypes.new_message()
test_regression.init_all_types(msg)
b = msg.to_bytes()
v = memoryview(b)
msg = all_types.TestAllTypes.from_bytes(v)
test_regression.check_all_types(msg)
def test_roundtrip_bytes_fail(all_types):
with pytest.raises(TypeError):
all_types.TestAllTypes.from_bytes(42)
@pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason="This works in PyPy 4.0.1 but travisci's version of PyPy has some bug that fails this test.") @pytest.mark.skipif(platform.python_implementation() == 'PyPy', reason="This works in PyPy 4.0.1 but travisci's version of PyPy has some bug that fails this test.")
def test_roundtrip_bytes_packed(all_types): def test_roundtrip_bytes_packed(all_types):
msg = all_types.TestAllTypes.new_message() msg = all_types.TestAllTypes.new_message()