[Python-checkins] r46657 - in python/trunk: Lib/bsddb/test/test_basics.py Modules/_bsddb.c

[gregory.p.smith]

Author: gregory.p.smith
Date: Mon Jun  5 02:31:01 2006
New Revision: 46657

Modified:
   python/trunk/Lib/bsddb/test/test_basics.py
   python/trunk/Modules/_bsddb.c
Log:
bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present
in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized
char **log_list.

feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2.



Modified: python/trunk/Lib/bsddb/test/test_basics.py
==============================================================================
--- python/trunk/Lib/bsddb/test/test_basics.py	(original)
+++ python/trunk/Lib/bsddb/test/test_basics.py	Mon Jun  5 02:31:01 2006
@@ -665,6 +665,9 @@
         for log in logs:
             if verbose:
                 print 'log file: ' + log
+        if db.version >= (4,2):
+            logs = self.env.log_archive(db.DB_ARCH_REMOVE)
+            assert not logs
 
         self.txn = self.env.txn_begin()
 

Modified: python/trunk/Modules/_bsddb.c
==============================================================================
--- python/trunk/Modules/_bsddb.c	(original)
+++ python/trunk/Modules/_bsddb.c	Mon Jun  5 02:31:01 2006
@@ -4371,13 +4371,17 @@
 {
     int flags=0;
     int err;
-    char **log_list_start, **log_list;
+    char **log_list = NULL;
     PyObject* list;
     PyObject* item = NULL;
 
     if (!PyArg_ParseTuple(args, "|i:log_archive", &flags))
         return NULL;
 
+    list = PyList_New(0);
+    if (list == NULL)
+        return NULL;
+
     CHECK_ENV_NOT_CLOSED(self);
     MYDB_BEGIN_ALLOW_THREADS;
 #if (DBVER >= 40)
@@ -4390,11 +4394,8 @@
     MYDB_END_ALLOW_THREADS;
     RETURN_IF_ERR();
 
-    list = PyList_New(0);
-    if (list == NULL)
-        return NULL;
-
     if (log_list) {
+        char **log_list_start;
         for (log_list_start = log_list; *log_list != NULL; ++log_list) {
             item = PyString_FromString (*log_list);
             if (item == NULL) {
@@ -5247,6 +5248,9 @@
     ADD_INT(d, DB_ARCH_ABS);
     ADD_INT(d, DB_ARCH_DATA);
     ADD_INT(d, DB_ARCH_LOG);
+#if (DBVER >= 42)
+    ADD_INT(d, DB_ARCH_REMOVE);
+#endif
 
     ADD_INT(d, DB_BTREE);
     ADD_INT(d, DB_HASH);