From c4e335b67a5469e621fa4771454be99cc5aae791 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 30 Apr 2015 08:08:13 -0700 Subject: [PATCH] Issue #23910: Optimize property() getter calls. Patch by Joe Jevnik --- Misc/NEWS | 2 ++ Objects/descrobject.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 6baf57ceed..fad0502744 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ Core and Builtins - Issue #23996: Avoid a crash when a delegated generator raises an 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 #9951: Added a hex() method to bytes, bytearray, and memoryview. diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 2df5ac5f73..822fb4182b 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -1372,6 +1372,8 @@ property_dealloc(PyObject *self) static PyObject * property_descr_get(PyObject *self, PyObject *obj, PyObject *type) { + static PyObject *args = NULL; + PyObject *ret; propertyobject *gs = (propertyobject *)self; 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"); 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 -- 2.40.0