Skip to content

BLD: fix py37 build warnings #26769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 27, 2019
Merged

BLD: fix py37 build warnings #26769

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de4bbbc
BLD: fix build warning for deprecated PyObject_AsReadBuffer
jbrockmendel Jun 7, 2019
3732f7d
Merge branch 'master' of https://github.com/pandas-dev/pandas into bl…
jbrockmendel Jun 10, 2019
3022cff
Merge branch 'master' of https://github.com/pandas-dev/pandas into bl…
jbrockmendel Jun 10, 2019
48e17e3
Merge branch 'master' of https://github.com/pandas-dev/pandas into bl…
jbrockmendel Jun 10, 2019
4b3dbc9
Merge branch 'master' of https://github.com/pandas-dev/pandas into bl…
jbrockmendel Jun 21, 2019
b03beac
release buffer at very end
jbrockmendel Jun 27, 2019
8db2301
Merge branch 'master' of https://github.com/pandas-dev/pandas into bl…
jbrockmendel Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions pandas/io/msgpack/_unpacker.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ from cython cimport Py_ssize_t

from cpython cimport (
PyCallable_Check,
PyBUF_SIMPLE, PyObject_GetBuffer, PyBuffer_Release,
PyBUF_SIMPLE, PyObject_GetBuffer, PyBuffer_Release, Py_buffer,
PyBytes_Size,
PyBytes_FromStringAndSize,
PyBytes_AsString)

cdef extern from "Python.h":
ctypedef struct PyObject
cdef int PyObject_AsReadBuffer(object o, const void** buff,
Py_ssize_t* buf_len) except -1

from libc.stdlib cimport free, malloc
from libc.string cimport memcpy, memmove
Expand Down Expand Up @@ -129,8 +127,14 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
Py_ssize_t buf_len
char* cenc = NULL
char* cerr = NULL
Py_buffer view
bytes extra_bytes

PyObject_AsReadBuffer(packed, <const void**>&buf, &buf_len)
# GH#26769 Effectively re-implement deprecated PyObject_AsReadBuffer;
# based on https://xpra.org/trac/ticket/1884
PyObject_GetBuffer(packed, &view, PyBUF_SIMPLE)
buf = <char*>view.buf
buf_len = view.len

if encoding is not None:
if isinstance(encoding, unicode):
Expand All @@ -149,10 +153,13 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
if ret == 1:
obj = unpack_data(&ctx)
if <Py_ssize_t> off < buf_len:
raise ExtraData(obj, PyBytes_FromStringAndSize(
buf + off, buf_len - off))
extra_bytes = PyBytes_FromStringAndSize(buf + off, buf_len - off)
PyBuffer_Release(&view)
raise ExtraData(obj, extra_bytes)
PyBuffer_Release(&view)
return obj
else:
PyBuffer_Release(&view)
raise UnpackValueError("Unpack failed: error = {ret}".format(ret=ret))


Expand Down