mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

change set_bt_compare() callback comparison function to only take two

Browse source 
arguments (left, right) like any sane comparison function.  no need to
pass in the db object as an argument.
This commit is contained in:
Gregory P. Smith 2005-06-06 17:31:32 +00:00
parent 889bca0df1
commit ac741c57d4
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_bsddb.c
View file

@ -97,7 +97,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
#define PY_BSDDB_VERSION "4.3.2"
#define PY_BSDDB_VERSION "4.3.3"
static char *rcs_id = "$Id$";
@ -2019,11 +2019,10 @@ _db_compareCallback (DB* db,
leftObject = PyString_FromStringAndSize (leftKey->data, leftKey->size);
rightObject = PyString_FromStringAndSize (rightKey->data, rightKey->size);
args = PyTuple_New (3);
args = PyTuple_New (2);
Py_INCREF (self);
PyTuple_SET_ITEM (args, 0, (PyObject *) self);
PyTuple_SET_ITEM (args, 1, leftObject); /* steals reference */
PyTuple_SET_ITEM (args, 2, rightObject); /* steals reference */
PyTuple_SET_ITEM (args, 0, leftObject); /* steals reference */
PyTuple_SET_ITEM (args, 1, rightObject); /* steals reference */
result = PyEval_CallObject (self->btCompareCallback, args);
if (result == 0) {
@ -2072,14 +2071,12 @@ DB_set_bt_compare (DBObject* self, PyObject* args)
* string objects here. verify that it returns an int (0).
* err if not.
*/
tuple = PyTuple_New (3);
Py_INCREF (self);
PyTuple_SET_ITEM (tuple, 0, (PyObject *) self);
tuple = PyTuple_New (2);
emptyStr = PyString_FromStringAndSize (NULL, 0);
Py_INCREF(emptyStr);
PyTuple_SET_ITEM (tuple, 1, emptyStr);
PyTuple_SET_ITEM (tuple, 2, emptyStr); /* steals reference */
PyTuple_SET_ITEM (tuple, 0, emptyStr);
PyTuple_SET_ITEM (tuple, 1, emptyStr); /* steals reference */
result = PyEval_CallObject (comparator, tuple);
Py_DECREF (tuple);
if (result == 0 || !PyInt_Check(result)) {