mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 22:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-28856: Let %b format for bytes support objects that follow the buffer protocol (GH-664)

Browse source
This commit is contained in:
Xiang Zhang 2017-03-14 15:27:01 +08:00 • committed by GitHub
parent 388e2568fc
commit faa2cc63e4
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/bytesobject.c
View file

@ -528,6 +528,8 @@ byte_converter(PyObject *arg, char *p)
return 0;
}
static PyObject *_PyBytes_FromBuffer(PyObject *x);
static PyObject *
format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen)
{
@ -564,8 +566,19 @@ format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen)
*plen = PyBytes_GET_SIZE(result);
return result;
}
/* does it support buffer protocol? */
if (PyObject_CheckBuffer(v)) {
/* maybe we can avoid making a copy of the buffer object here? */
result = _PyBytes_FromBuffer(v);
if (result == NULL)
return NULL;
*pbuf = PyBytes_AS_STRING(result);
*plen = PyBytes_GET_SIZE(result);
return result;
}
PyErr_Format(PyExc_TypeError,
"%%b requires bytes, or an object that implements __bytes__, not '%.100s'",
"%%b requires a bytes-like object, "
"or an object that implements __bytes__, not '%.100s'",
Py_TYPE(v)->tp_name);
return NULL;
}