mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge 3.5.

Browse source
This commit is contained in:
Stefan Krah 2015-11-10 18:18:07 +01:00
commit 3407cc26cb
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/memoryobject.c
View file

@ -2156,8 +2156,23 @@ static PyObject *
memory_hex(PyMemoryViewObject *self, PyObject *dummy)
{
Py_buffer *src = VIEW_ADDR(self);
PyObject *bytes;
PyObject *ret;
CHECK_RELEASED(self);
return _Py_strhex(src->buf, src->len);
if (MV_C_CONTIGUOUS(self->flags)) {
return _Py_strhex(src->buf, src->len);
}
bytes = memory_tobytes(self, dummy);
if (bytes == NULL)
return NULL;
ret = _Py_strhex(PyBytes_AS_STRING(bytes), Py_SIZE(bytes));
Py_DECREF(bytes);
return ret;
}
static PyObject *