From 9a75d56d5d9fdffb6ce9d83ede98486df238102d Mon Sep 17 00:00:00 2001
From: Nice Zombies <nineteendo19d0@gmail.com>
Date: Tue, 30 Apr 2024 16:55:15 +0200
Subject: gh-118379: Use PyTuple_Pack instead of Py_BuildValue if possible
 (GH-118381)

---
 Modules/_decimal/_decimal.c | 4 ++--
 Modules/_testbuffer.c       | 2 +-
 Modules/_testcapimodule.c   | 4 ++--
 Modules/_testclinic.c       | 2 +-
 Modules/posixmodule.c       | 2 +-
 Python/errors.c             | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index c105367..fe67111 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -4287,7 +4287,7 @@ nm_mpd_qdivmod(PyObject *v, PyObject *w)
         return NULL;
     }
 
-    ret = Py_BuildValue("(OO)", q, r);
+    ret = PyTuple_Pack(2, q, r);
     Py_DECREF(r);
     Py_DECREF(q);
     return ret;
@@ -5312,7 +5312,7 @@ ctx_mpd_qdivmod(PyObject *context, PyObject *args)
         return NULL;
     }
 
-    ret = Py_BuildValue("(OO)", q, r);
+    ret = PyTuple_Pack(2, q, r);
     Py_DECREF(r);
     Py_DECREF(q);
     return ret;
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
index cad21bd..9e77744 100644
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -1217,7 +1217,7 @@ init_ndbuf(PyObject *items, PyObject *shape, PyObject *strides,
 
     /* convert scalar to list */
     if (ndim == 0) {
-        items = Py_BuildValue("(O)", items);
+        items = PyTuple_Pack(1, items);
         if (items == NULL)
             return NULL;
     }
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 0bdd252..3448291 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2475,7 +2475,7 @@ get_basic_static_type(PyObject *self, PyObject *args)
     PyTypeObject *cls = &BasicStaticTypes[num_basic_static_types_used++];
 
     if (base != NULL) {
-        cls->tp_bases = Py_BuildValue("(O)", base);
+        cls->tp_bases = PyTuple_Pack(1, base);
         if (cls->tp_bases == NULL) {
             return NULL;
         }
@@ -3474,7 +3474,7 @@ typedef struct {
 static PyObject *
 ipowType_ipow(PyObject *self, PyObject *other, PyObject *mod)
 {
-    return Py_BuildValue("OO", other, mod);
+    return PyTuple_Pack(2, other, mod);
 }
 
 static PyNumberMethods ipowType_as_number = {
diff --git a/Modules/_testclinic.c b/Modules/_testclinic.c
index 454173b..2e9d00a 100644
--- a/Modules/_testclinic.c
+++ b/Modules/_testclinic.c
@@ -1243,7 +1243,7 @@ _testclinic_TestClass_get_defining_class_arg_impl(PyObject *self,
                                                   PyObject *arg)
 /*[clinic end generated code: output=fe7e49d96cbb7718 input=d1b83d3b853af6d9]*/
 {
-    return Py_BuildValue("(OO)", cls, arg);
+    return PyTuple_Pack(2, cls, arg);
 }
 
 static struct PyMethodDef test_class_methods[] = {
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c9d67cc..722159a 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5500,7 +5500,7 @@ os__path_splitroot_ex_impl(PyObject *module, PyObject *path)
     if (tail == NULL) {
         goto exit;
     }
-    result = Py_BuildValue("(OOO)", drv, root, tail);
+    result = PyTuple_Pack(3, drv, root, tail);
 exit:
     PyMem_Free(buffer);
     Py_XDECREF(drv);
diff --git a/Python/errors.c b/Python/errors.c
index e5f176a..433253b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -632,8 +632,8 @@ _PyErr_StackItemToExcInfoTuple(_PyErr_StackItem *err_info)
     PyObject *exc_type = get_exc_type(exc_value);
     PyObject *exc_traceback = get_exc_traceback(exc_value);
 
-    return Py_BuildValue(
-        "(OOO)",
+    return PyTuple_Pack(
+        3,
         exc_type ? exc_type : Py_None,
         exc_value ? exc_value : Py_None,
         exc_traceback ? exc_traceback : Py_None);
-- 
cgit v0.12