summaryrefslogtreecommitdiff
path: root/Objects/bytearrayobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-12-04 22:59:09 +0100
committerVictor Stinner <victor.stinner@gmail.com>2016-12-04 22:59:09 +0100
commitde4ae3d4869e88dda8bfbad24880cb398160a7a0 (patch)
treeb8c42842a31f408c9fe09993e19fba49d60b2dcf /Objects/bytearrayobject.c
parentc8d03187ff85326ab8b24af06f8a4e391365f42a (diff)
downloadcpython-git-de4ae3d4869e88dda8bfbad24880cb398160a7a0.tar.gz
Backed out changeset b9c9691c72c5
Issue #28858: The change b9c9691c72c5 introduced a regression. It seems like _PyObject_CallArg1() uses more stack memory than PyObject_CallFunctionObjArgs().
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r--Objects/bytearrayobject.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 853156eabc..16b4fd7a90 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -98,7 +98,8 @@ _canresize(PyByteArrayObject *self)
PyObject *
PyByteArray_FromObject(PyObject *input)
{
- return _PyObject_CallArg1((PyObject *)&PyByteArray_Type, input);
+ return PyObject_CallFunctionObjArgs((PyObject *)&PyByteArray_Type,
+ input, NULL);
}
PyObject *
@@ -1984,7 +1985,8 @@ bytearray_fromhex_impl(PyTypeObject *type, PyObject *string)
{
PyObject *result = _PyBytes_FromHex(string, type == &PyByteArray_Type);
if (type != &PyByteArray_Type && result != NULL) {
- Py_SETREF(result, _PyObject_CallArg1((PyObject *)type, result));
+ Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
+ result, NULL));
}
return result;
}