From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 26 Jan 2006 05:19:56 +0000 (+0000)
Subject: Backport 42173: get bsddb test_associate to pass with BSDDB 4.1
X-Git-Tag: v2.4.3c1~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd8a8c3586c410600eb008a1437243f784054627;p=thirdparty%2FPython%2Fcpython.git

Backport 42173: get bsddb test_associate to pass with BSDDB 4.1
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index c6efa1cc901a..07c56cdd66b2 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -906,7 +906,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;
@@ -2996,7 +2996,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);