mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +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

3
Lib/test/test_descr.py
View file

@ -1743,7 +1743,7 @@ order (MRO) for bases """
return b"hello" return b"hello"
def empty_seq(self): def empty_seq(self):
return [] return []
def zero(self): def zero(self, other=None):
return 0 return 0
def complex_num(self): def complex_num(self):
return 1j return 1j
@ -1789,6 +1789,7 @@ order (MRO) for bases """
("__trunc__", int, zero, set(), {}), ("__trunc__", int, zero, set(), {}),
("__ceil__", math.ceil, zero, set(), {}), ("__ceil__", math.ceil, zero, set(), {}),
("__dir__", dir, empty_seq, set(), {}), ("__dir__", dir, empty_seq, set(), {}),
("__round__", round, zero, set(), {}),
] ]
class Checker(object): class Checker(object):

2
Misc/NEWS
View file

@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #17722: When looking up __round__, resolve descriptors.
- Issue #16061: Speed up str.replace() for replacing 1-character strings. - Issue #16061: Speed up str.replace() for replacing 1-character strings.
- Issue #17715: Fix segmentation fault from raising an exception in a __trunc__ - Issue #17715: Fix segmentation fault from raising an exception in a __trunc__

19
Python/bltinmodule.c
View file

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