From 7784f12d745e5f0d2e4c9e98c792f026897325ea Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 26 May 2006 20:04:44 +0000
Subject: [PATCH] Replace Py_BuildValue("OO") by PyTuple_Pack.

---
 Modules/_ctypes/_ctypes.c | 2 +-
 Python/ast.c              | 2 +-
 Python/compile.c          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 6a278330012..6bb0880f06d 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -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
 		  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,
 		     "incompatible types, %s instance instead of %s instance",
diff --git a/Python/ast.c b/Python/ast.c
index 96645900552..f3e611b8e37 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -107,7 +107,7 @@ ast_error_finish(const char *filename)
 	Py_DECREF(errstr);
 	return;
     }
-    value = Py_BuildValue("(OO)", errstr, tmp);
+    value = PyTuple_Pack(2, errstr, tmp);
     Py_DECREF(errstr);
     Py_DECREF(tmp);
     if (!value)
diff --git a/Python/compile.c b/Python/compile.c
index 15e7e158118..e555fec9252 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -334,7 +334,7 @@ list2dict(PyObject *list)
 			return NULL;
 		}
 		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) {
 			Py_XDECREF(k);
 			Py_DECREF(v);
@@ -377,7 +377,7 @@ dictbytype(PyObject *src, int scope_type, int flag, int offset)
 				return NULL;
 			}
 			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) {
 				Py_DECREF(item);
 				Py_DECREF(dest);
@@ -1841,7 +1841,7 @@ static int
 compiler_lookup_arg(PyObject *dict, PyObject *name)
 {
     PyObject *k, *v;
-    k = Py_BuildValue("(OO)", name, name->ob_type);
+    k = PyTuple_Pack(2, name, name->ob_type);
     if (k == NULL)
 	return -1;
     v = PyDict_GetItem(dict, k);