mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-13 12:17:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

commits sourceforge patch #1407992 by neil.norwitz.

Browse source 
this fixes the bsddb db associate tests when compiled against
BerkeleyDB 3.3 thru 4.1.  4.2 thru 4.4 already passed and still
pass.
This commit is contained in:
Gregory P. Smith 2006-01-24 19:55:02 +00:00
parent ec2f74f4b1
commit 4e414d8386
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_bsddb.c
View file

@ -97,7 +97,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
#define PY_BSDDB_VERSION "4.4.0"
#define PY_BSDDB_VERSION "4.4.1"
static char *rcs_id = "$Id$";
@ -912,7 +912,7 @@ DBEnv_dealloc(DBEnvObject* self)
}
#endif
if (self->db_env) {
if (self->db_env && !self->closed) {
MYDB_BEGIN_ALLOW_THREADS;
self->db_env->close(self->db_env, 0);
MYDB_END_ALLOW_THREADS;
@ -1534,11 +1534,11 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
keyObj = PyInt_FromLong(*(int *)key.data);
else
keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
}
else /* return just the pkey and data */
{
retval = Py_BuildValue("OO", pkeyObj, dataObj);
retval = PyTuple_Pack(2, pkeyObj, dataObj);
}
FREE_DBT(pkey);
FREE_DBT(data);
@ -3176,7 +3176,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
else
pkeyObj = PyString_FromStringAndSize(pkey.data, pkey.size);
if (flags & DB_SET_RECNO) /* return key, pkey and data */
if (key.data && key.size) /* return key, pkey and data */
{
PyObject *keyObj;
int type = _DB_get_type(self->mydb);
@ -3184,12 +3184,12 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
keyObj = PyInt_FromLong(*(int *)key.data);
else
keyObj = PyString_FromStringAndSize(key.data, key.size);
retval = Py_BuildValue("OOO", keyObj, pkeyObj, dataObj);
retval = PyTuple_Pack(3, keyObj, pkeyObj, dataObj);
FREE_DBT(key);
}
else /* return just the pkey and data */
{
retval = Py_BuildValue("OO", pkeyObj, dataObj);
retval = PyTuple_Pack(2, pkeyObj, dataObj);
}
FREE_DBT(pkey);
FREE_DBT(data);