mirror of https://github.com/python/cpython
Replace Py_BuildValue("OO") by PyTuple_Pack.
This commit is contained in:
parent
07bbfc6a51
commit
7784f12d74
|
@ -2185,7 +2185,7 @@ _CData_set(CDataObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
|
||||||
only it's object list. So we create a tuple, containing
|
only it's object list. So we create a tuple, containing
|
||||||
b_objects list PLUS the array itself, and return that!
|
b_objects list PLUS the array itself, and return that!
|
||||||
*/
|
*/
|
||||||
return Py_BuildValue("(OO)", keep, value);
|
return PyTuple_Pack(2, keep, value);
|
||||||
}
|
}
|
||||||
PyErr_Format(PyExc_TypeError,
|
PyErr_Format(PyExc_TypeError,
|
||||||
"incompatible types, %s instance instead of %s instance",
|
"incompatible types, %s instance instead of %s instance",
|
||||||
|
|
|
@ -107,7 +107,7 @@ ast_error_finish(const char *filename)
|
||||||
Py_DECREF(errstr);
|
Py_DECREF(errstr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
value = Py_BuildValue("(OO)", errstr, tmp);
|
value = PyTuple_Pack(2, errstr, tmp);
|
||||||
Py_DECREF(errstr);
|
Py_DECREF(errstr);
|
||||||
Py_DECREF(tmp);
|
Py_DECREF(tmp);
|
||||||
if (!value)
|
if (!value)
|
||||||
|
|
|
@ -334,7 +334,7 @@ list2dict(PyObject *list)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
k = PyList_GET_ITEM(list, i);
|
k = PyList_GET_ITEM(list, i);
|
||||||
k = Py_BuildValue("(OO)", k, k->ob_type);
|
k = PyTuple_Pack(2, k, k->ob_type);
|
||||||
if (k == NULL || PyDict_SetItem(dict, k, v) < 0) {
|
if (k == NULL || PyDict_SetItem(dict, k, v) < 0) {
|
||||||
Py_XDECREF(k);
|
Py_XDECREF(k);
|
||||||
Py_DECREF(v);
|
Py_DECREF(v);
|
||||||
|
@ -377,7 +377,7 @@ dictbytype(PyObject *src, int scope_type, int flag, int offset)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
tuple = Py_BuildValue("(OO)", k, k->ob_type);
|
tuple = PyTuple_Pack(2, k, k->ob_type);
|
||||||
if (!tuple || PyDict_SetItem(dest, tuple, item) < 0) {
|
if (!tuple || PyDict_SetItem(dest, tuple, item) < 0) {
|
||||||
Py_DECREF(item);
|
Py_DECREF(item);
|
||||||
Py_DECREF(dest);
|
Py_DECREF(dest);
|
||||||
|
@ -1841,7 +1841,7 @@ static int
|
||||||
compiler_lookup_arg(PyObject *dict, PyObject *name)
|
compiler_lookup_arg(PyObject *dict, PyObject *name)
|
||||||
{
|
{
|
||||||
PyObject *k, *v;
|
PyObject *k, *v;
|
||||||
k = Py_BuildValue("(OO)", name, name->ob_type);
|
k = PyTuple_Pack(2, name, name->ob_type);
|
||||||
if (k == NULL)
|
if (k == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
v = PyDict_GetItem(dict, k);
|
v = PyDict_GetItem(dict, k);
|
||||||
|
|
Loading…
Reference in New Issue