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

properly lookup the __round__ special method (closes #17722)

Browse source
This commit is contained in:
Benjamin Peterson 2013-04-13 17:19:01 -04:00
parent c1ab0bd788
commit 214a7d2674
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Python/bltinmodule.c
View file

@ -1810,10 +1810,10 @@ For most object types, eval(repr(object)) == object.");
static PyObject *
builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
{
static PyObject *round_str = NULL;
PyObject *ndigits = NULL;
static char *kwlist[] = {"number", "ndigits", 0};
PyObject *number, *round;
PyObject *number, *round, *result;
_Py_IDENTIFIER(__round__);
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:round",
kwlist, &number, &ndigits))
@ -1824,24 +1824,21 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
return NULL;
}
if (round_str == NULL) {
round_str = PyUnicode_InternFromString("__round__");
if (round_str == NULL)
return NULL;
}
round = _PyType_Lookup(Py_TYPE(number), round_str);
round = _PyObject_LookupSpecial(number, &PyId___round__);
if (round == NULL) {
PyErr_Format(PyExc_TypeError,
"type %.100s doesn't define __round__ method",
Py_TYPE(number)->tp_name);
if (!PyErr_Occurred())
PyErr_Format(PyExc_TypeError,
"type %.100s doesn't define __round__ method",
Py_TYPE(number)->tp_name);
return NULL;
}
if (ndigits == NULL)
return PyObject_CallFunction(round, "O", number);
result = PyObject_CallFunctionObjArgs(round, NULL);
else
return PyObject_CallFunction(round, "OO", number, ndigits);
result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);
Py_DECREF(round);
return result;
}
PyDoc_STRVAR(round_doc,