From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 30 Jan 2006 00:22:08 +0000 (+0000)
Subject: maintain support for older python versions in this module so that it
X-Git-Tag: v2.5a0~729
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd049a696de28f5f7a8e3ede30ce8bd7d35486ea;p=thirdparty%2FPython%2Fcpython.git

maintain support for older python versions in this module so that it
is ok for a standalone pybsddb source dist for use with <= 2.3.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index f7541274b6b5..fca203dc3213 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -1537,11 +1537,19 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
                 keyObj = PyInt_FromLong(*(int *)key.data);
             else
                 keyObj = PyString_FromStringAndSize(key.data, key.size);
+#if (PY_VERSION_HEX >= 0x02040000)
             retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
+#else
+            retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
+#endif
         }
         else /* return just the pkey and data */
         {
+#if (PY_VERSION_HEX >= 0x02040000)
             retval = PyTuple_Pack(2, pkeyObj, dataObj);
+#else
+            retval = Py_BuildValue("OO", pkeyObj, dataObj);
+#endif
         }
 	FREE_DBT(pkey);
         FREE_DBT(data);
@@ -3187,12 +3195,20 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
                 keyObj = PyInt_FromLong(*(int *)key.data);
             else
                 keyObj = PyString_FromStringAndSize(key.data, key.size);
+#if (PY_VERSION_HEX >= 0x02040000)
             retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
+#else
+            retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
+#endif
             FREE_DBT(key);
         }
         else /* return just the pkey and data */
         {
+#if (PY_VERSION_HEX >= 0x02040000)
             retval = PyTuple_Pack(2, pkeyObj, dataObj);
+#else
+            retval = Py_BuildValue("OO", pkeyObj, dataObj);
+#endif
         }
         FREE_DBT(pkey);
         FREE_DBT(data);