mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

make bytes(o) respect __bytes__ #2415

Browse source 
This adds two new C-API functions: PyObject_Bytes and PyBytes_FromObject.

Reviewer: Barry
This commit is contained in:
Benjamin Peterson 2008-08-26 16:46:47 +00:00
parent a786b026c9
commit c15a07333e
8 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Objects/object.c
View file

@ -453,6 +453,45 @@ PyObject_ASCII(PyObject *v)
return res;
}
PyObject *
PyObject_Bytes(PyObject *v)
{
PyObject *bytesmeth, *result, *func;
static PyObject *bytesstring = NULL;
if (bytesstring == NULL) {
bytesstring = PyUnicode_InternFromString("__bytes__");
if (bytesstring == NULL)
return NULL;
}
if (v == NULL)
return PyBytes_FromString("<NULL>");
if (PyBytes_CheckExact(v)) {
Py_INCREF(v);
return v;
}
/* Doesn't create a reference */
func = _PyType_Lookup(Py_TYPE(v), bytesstring);
if (func != NULL) {
result = PyObject_CallFunctionObjArgs(func, v, NULL);
if (result == NULL)
return NULL;
if (!PyBytes_Check(result)) {
PyErr_Format(PyExc_TypeError,
"__bytes__ returned non-bytes (type %.200s)",
Py_TYPE(result)->tp_name);
Py_DECREF(result);
return NULL;
}
return result;
}
PyErr_Clear();
return PyBytes_FromObject(v);
}
/* The new comparison philosophy is: we completely separate three-way
comparison from rich comparison. That is, PyObject_Compare() and
PyObject_Cmp() *just* use the tp_compare slot. And PyObject_RichCompare()