mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 14:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23910: Optimize property() getter calls. Patch by Joe Jevnik

Browse source
This commit is contained in:
Raymond Hettinger 2015-04-30 08:08:13 -07:00
parent dd2693fc1f
commit c4e335b67a
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -13,6 +13,8 @@ Core and Builtins
- Issue #23996: Avoid a crash when a delegated generator raises an - Issue #23996: Avoid a crash when a delegated generator raises an
unnormalized StopIteration exception. Patch by Stefan Behnel. unnormalized StopIteration exception. Patch by Stefan Behnel.
- Issue #23910: Optimize property() getter calls. Patch by Joe Jevnik.
- Issue #24022: Fix tokenizer crash when processing undecodable source code. - Issue #24022: Fix tokenizer crash when processing undecodable source code.
- Issue #9951: Added a hex() method to bytes, bytearray, and memoryview. - Issue #9951: Added a hex() method to bytes, bytearray, and memoryview.

10
Objects/descrobject.c
View file

@ -1372,6 +1372,8 @@ property_dealloc(PyObject *self)
static PyObject * static PyObject *
property_descr_get(PyObject *self, PyObject *obj, PyObject *type) property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
{ {
static PyObject *args = NULL;
PyObject *ret;
propertyobject *gs = (propertyobject *)self; propertyobject *gs = (propertyobject *)self;
if (obj == NULL || obj == Py_None) { if (obj == NULL || obj == Py_None) {
@ -1382,7 +1384,13 @@ property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
PyErr_SetString(PyExc_AttributeError, "unreadable attribute"); PyErr_SetString(PyExc_AttributeError, "unreadable attribute");
return NULL; return NULL;
} }
return PyObject_CallFunctionObjArgs(gs->prop_get, obj, NULL); if (!args && !(args = PyTuple_New(1))) {
return NULL;
}
PyTuple_SET_ITEM(args, 0, obj);
ret = PyObject_Call(gs->prop_get, args, NULL);
PyTuple_SET_ITEM(args, 0, NULL);
return ret;
} }
static int static int