* fix DBCursor.pget() bug with keyword argument names when no data= is

    supplied [SF pybsddb bug #1477863]

diff --git a/Lib/bsddb/test/test_all.py b/Lib/bsddb/test/test_all.py
index 23c768cc708fa382bb73f06bf04e054c820ea18b..ad8b1e9e94e28f5ece485a9b460be4b8ff7484ca 100644 (file)
--- a/Lib/bsddb/test/test_all.py
+++ b/Lib/bsddb/test/test_all.py
@@ -70,6 +70,7 @@ def suite():
         'test_recno',
         'test_thread',
         'test_sequence',
+        'test_cursor_pget_bug',
         ]
 
     alltests = unittest.TestSuite()

diff --git a/Lib/bsddb/test/test_cursor_pget_bug.py b/Lib/bsddb/test/test_cursor_pget_bug.py
new file mode 100644 (file)
index 0000000..8ac5f6c
--- /dev/null
+++ b/Lib/bsddb/test/test_cursor_pget_bug.py
@@ -0,0 +1,65 @@
+import unittest\r
+import sys, os, glob\r
+\r
+try:\r
+    # For Pythons w/distutils pybsddb\r
+    from bsddb3 import db\r
+except ImportError:\r
+    # For Python 2.3\r
+    from bsddb import db\r
+\r
+\r
+#----------------------------------------------------------------------\r
+\r
+class pget_bugTestCase(unittest.TestCase):\r
+    """Verify that cursor.pget works properly"""\r
+    db_name = 'test-cursor_pget.db'\r
+\r
+    def setUp(self):\r
+        self.homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home')\r
+        try:\r
+            os.mkdir(self.homeDir)\r
+        except os.error:\r
+            pass\r
+        self.env = db.DBEnv()\r
+        self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL)\r
+        self.primary_db = db.DB(self.env)\r
+        self.primary_db.open(self.db_name, 'primary', db.DB_BTREE, db.DB_CREATE)\r
+        self.secondary_db = db.DB(self.env)\r
+        self.secondary_db.set_flags(db.DB_DUP)\r
+        self.secondary_db.open(self.db_name, 'secondary', db.DB_BTREE, db.DB_CREATE)\r
+        self.primary_db.associate(self.secondary_db, lambda key, data: data)\r
+        self.primary_db.put('salad', 'eggs')\r
+        self.primary_db.put('spam', 'ham')\r
+        self.primary_db.put('omelet', 'eggs')\r
+\r
+\r
+    def tearDown(self):\r
+        self.secondary_db.close()\r
+        self.primary_db.close()\r
+        self.env.close()\r
+        del self.secondary_db\r
+        del self.primary_db\r
+        del self.env\r
+        for file in glob.glob(os.path.join(self.homeDir, '*')):\r
+            os.remove(file)\r
+        os.removedirs(self.homeDir)\r
+\r
+    def test_pget(self):\r
+        cursor = self.secondary_db.cursor()\r
+\r
+        self.assertEquals(('eggs', 'salad', 'eggs'), cursor.pget(key='eggs', flags=db.DB_SET))\r
+        self.assertEquals(('eggs', 'omelet', 'eggs'), cursor.pget(db.DB_NEXT_DUP))\r
+        self.assertEquals(None, cursor.pget(db.DB_NEXT_DUP))\r
+\r
+        self.assertEquals(('ham', 'spam', 'ham'), cursor.pget('ham', 'spam', flags=db.DB_SET))\r
+        self.assertEquals(None, cursor.pget(db.DB_NEXT_DUP))\r
+\r
+        cursor.close()\r
+\r
+\r
+def test_suite():\r
+    return unittest.makeSuite(pget_bugTestCase)\r
+\r
+if __name__ == '__main__':\r
+    unittest.main(defaultTest='test_suite')\r

diff --git a/Lib/test/test_bsddb3.py b/Lib/test/test_bsddb3.py
index dcc7c43500a1a4a1bdf23c7112fced57c43403b1..8b0c50c8c55547205ba6526de66032fef6eb03e6 100644 (file)
--- a/Lib/test/test_bsddb3.py
+++ b/Lib/test/test_bsddb3.py
@@ -45,6 +45,7 @@ def suite():
         'test_recno',
         'test_thread',
         'test_sequence',
+        'test_cursor_pget_bug',
         ]
 
     alltests = unittest.TestSuite()

diff --git a/Misc/NEWS b/Misc/NEWS
index af9cf20a734842819f0c464d333c6aebb9b460eb..cbdcdacad3f2b82d744326d42c4784440462688b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -109,9 +109,13 @@ Extension Modules
   assuming BerkeleyDB >= 4.0 and 4.4 respectively.  [pybsddb project SF
   patch numbers 1494885 and 1494902]
 
-- bsddb: added an interface for the BerkeleyDB >= 4.3 DBSequence class
+- bsddb: added an interface for the BerkeleyDB >= 4.3 DBSequence class.
   [pybsddb project SF patch number 1466734]
 
+- bsddb: fix DBCursor.pget() bug with keyword argument names when no data
+  parameter is supplied.  [SF pybsddb bug #1477863]
+
+
 Library
 -------
 

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 90de6aec4b1ca6e743d3f3d91b984b36d7726104..b5df60506682caaa585135bb00ca07a8addf9012 100644 (file)
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -98,7 +98,7 @@
 #error "eek! DBVER can't handle minor versions > 9"
 #endif
 
-#define PY_BSDDB_VERSION "4.4.2"
+#define PY_BSDDB_VERSION "4.4.4"
 static char *rcs_id = "$Id$";
 
 
@@ -3194,8 +3194,8 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
     int dlen = -1;
     int doff = -1;
     DBT key, pkey, data;
-    static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
-                                     NULL };
+    static char* kwnames_keyOnly[] = { "key", "flags", "dlen", "doff", NULL };
+    static char* kwnames[] = { "key", "data", "flags", "dlen", "doff", NULL };
 
     CLEAR_DBT(key);
     CLEAR_DBT(data);
@@ -3204,7 +3204,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
     {
         PyErr_Clear();
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|ii:pget",
-                                         &kwnames[1], 
+                                         kwnames_keyOnly, 
                                         &keyobj, &flags, &dlen, &doff))
         {
             PyErr_Clear();