diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbobj.py Python-2.6.4/Lib/bsddb/dbobj.py

--- Python-2.6.4.orig/Lib/bsddb/dbobj.py	2008-07-23 07:38:42.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/dbobj.py	2009-12-04 07:36:00.000000000 -0500

@@ -110,15 +110,17 @@ class DBEnv:

     def log_stat(self, *args, **kwargs):

         return apply(self._cobj.log_stat, args, kwargs)

-    if db.version() >= (4,1):

-        def dbremove(self, *args, **kwargs):

-            return apply(self._cobj.dbremove, args, kwargs)

-        def dbrename(self, *args, **kwargs):

-            return apply(self._cobj.dbrename, args, kwargs)

-        def set_encrypt(self, *args, **kwargs):

-            return apply(self._cobj.set_encrypt, args, kwargs)

+    def dbremove(self, *args, **kwargs):

+        return apply(self._cobj.dbremove, args, kwargs)

+    def dbrename(self, *args, **kwargs):

+        return apply(self._cobj.dbrename, args, kwargs)

+    def set_encrypt(self, *args, **kwargs):

+        return apply(self._cobj.set_encrypt, args, kwargs)

     if db.version() >= (4,4):

+        def fileid_reset(self, *args, **kwargs):

+            return self._cobj.fileid_reset(*args, **kwargs)

+

         def lsn_reset(self, *args, **kwargs):

             return apply(self._cobj.lsn_reset, args, kwargs)

@@ -229,9 +231,8 @@ class DB(MutableMapping):

     def set_get_returns_none(self, *args, **kwargs):

         return apply(self._cobj.set_get_returns_none, args, kwargs)

-    if db.version() >= (4,1):

-        def set_encrypt(self, *args, **kwargs):

-            return apply(self._cobj.set_encrypt, args, kwargs)

+    def set_encrypt(self, *args, **kwargs):

+        return apply(self._cobj.set_encrypt, args, kwargs)

 class DBSequence:

diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbtables.py Python-2.6.4/Lib/bsddb/dbtables.py

--- Python-2.6.4.orig/Lib/bsddb/dbtables.py	2008-08-31 10:00:51.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/dbtables.py	2009-12-04 07:36:00.000000000 -0500

@@ -15,7 +15,7 @@

 # This provides a simple database table interface built on top of

 # the Python Berkeley DB 3 interface.

 #

-_cvsid = '$Id: dbtables.py 66088 2008-08-31 14:00:51Z jesus.cea $'

+_cvsid = '$Id: dbtables.py 58758 2007-11-01 21:15:36Z gregory.p.smith $'

 import re

 import sys

@@ -659,6 +659,13 @@ class bsdTableDB :

             a = atuple[1]

             b = btuple[1]

             if type(a) is type(b):

+

+                # Needed for python 3. "cmp" vanished in 3.0.1

+                def cmp(a, b) :

+                    if a==b : return 0

+                    if a

+                    return 1

+

                 if isinstance(a, PrefixCond) and isinstance(b, PrefixCond):

                     # longest prefix first

                     return cmp(len(b.prefix), len(a.prefix))

diff -Nupr Python-2.6.4.orig/Lib/bsddb/dbutils.py Python-2.6.4/Lib/bsddb/dbutils.py

--- Python-2.6.4.orig/Lib/bsddb/dbutils.py	2008-08-31 10:00:51.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/dbutils.py	2009-12-04 07:36:00.000000000 -0500

@@ -61,7 +61,7 @@ def DeadlockWrap(function, *_args, **_kw

     """

     sleeptime = _deadlock_MinSleepTime

     max_retries = _kwargs.get('max_retries', -1)

-    if _kwargs.has_key('max_retries'):

+    if 'max_retries' in _kwargs:

         del _kwargs['max_retries']

     while True:

         try:

diff -Nupr Python-2.6.4.orig/Lib/bsddb/__init__.py Python-2.6.4/Lib/bsddb/__init__.py

--- Python-2.6.4.orig/Lib/bsddb/__init__.py	2008-09-05 14:33:51.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/__init__.py	2009-12-04 07:36:00.000000000 -0500

@@ -33,7 +33,7 @@

 #----------------------------------------------------------------------

-"""Support for Berkeley DB 4.0 through 4.7 with a simple interface.

+"""Support for Berkeley DB 4.1 through 4.8 with a simple interface.

 For the full featured object oriented interface use the bsddb.db module

 instead.  It mirrors the Oracle Berkeley DB C API.

@@ -42,12 +42,6 @@ instead.  It mirrors the Oracle Berkeley

 import sys

 absolute_import = (sys.version_info[0] >= 3)

-if sys.py3kwarning:

-    import warnings

-    warnings.warnpy3k("in 3.x, bsddb has been removed; "

-                      "please use the pybsddb project instead",

-                      DeprecationWarning, 2)

-

 try:

     if __name__ == 'bsddb3':

         # import _pybsddb binary as it should be the more recent version from

@@ -442,8 +436,10 @@ def _checkflag(flag, file):

 # Berkeley DB was too.

 try:

-    import thread

-    del thread

+    # 2to3 automatically changes "import thread" to "import _thread"

+    import thread as T

+    del T

+

 except ImportError:

     db.DB_THREAD = 0

diff -Nupr Python-2.6.4.orig/Lib/bsddb/test/test_all.py Python-2.6.4/Lib/bsddb/test/test_all.py

--- Python-2.6.4.orig/Lib/bsddb/test/test_all.py	2008-09-03 18:07:11.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/test/test_all.py	2009-12-04 07:36:00.000000000 -0500

@@ -203,6 +203,16 @@ if sys.version_info[0] >= 3 :

                 k = bytes(k, charset)

             return self._db.has_key(k, txn=txn)

+        def set_re_delim(self, c) :

+            if isinstance(c, str) :  # We can use a numeric value byte too

+                c = bytes(c, charset)

+            return self._db.set_re_delim(c)

+

+        def set_re_pad(self, c) :

+            if isinstance(c, str) :  # We can use a numeric value byte too

+               c = bytes(c, charset)

+            return self._db.set_re_pad(c)

+

         def put(self, key, value, txn=None, flags=0, dlen=-1, doff=-1) :

             if isinstance(key, str) :

                 key = bytes(key, charset)

@@ -221,6 +231,11 @@ if sys.version_info[0] >= 3 :

                 key = bytes(key, charset)

             return self._db.get_size(key)

+        def exists(self, key, *args, **kwargs) :

+            if isinstance(key, str) :

+                key = bytes(key, charset)

+            return self._db.exists(key, *args, **kwargs)

+

         def get(self, key, default="MagicCookie", txn=None, flags=0, dlen=-1, doff=-1) :

             if isinstance(key, str) :

                 key = bytes(key, charset)

@@ -288,13 +303,21 @@ if sys.version_info[0] >= 3 :

                         key = key.decode(charset)

                     data = data.decode(charset)

                     key = self._callback(key, data)

-                    if (key != bsddb._db.DB_DONOTINDEX) and isinstance(key,

-                            str) :

-                        key = bytes(key, charset)

+                    if (key != bsddb._db.DB_DONOTINDEX) :

+                        if isinstance(key, str) :

+                            key = bytes(key, charset)

+                        elif isinstance(key, list) :

+                            key2 = []

+                            for i in key :

+                                if isinstance(i, str) :

+                                    i = bytes(i, charset)

+                                key2.append(i)

+                            key = key2

                     return key

             return self._db.associate(secondarydb._db,

-                    associate_callback(callback).callback, flags=flags, txn=txn)

+                    associate_callback(callback).callback, flags=flags,

+                    txn=txn)

         def cursor(self, txn=None, flags=0) :

             return cursor_py3k(self._db, txn=txn, flags=flags)

@@ -310,6 +333,12 @@ if sys.version_info[0] >= 3 :

         def __getattr__(self, v) :

             return getattr(self._dbenv, v)

+        def get_data_dirs(self) :

+            # Have to use a list comprehension and not

+            # generators, because we are supporting Python 2.3.

+            return tuple(

+                [i.decode(charset) for i in self._dbenv.get_data_dirs()])

+

     class DBSequence_py3k(object) :

         def __init__(self, db, *args, **kwargs) :

             self._db=db

@@ -332,7 +361,10 @@ if sys.version_info[0] >= 3 :

     bsddb._db.DBEnv_orig = bsddb._db.DBEnv

     bsddb._db.DB_orig = bsddb._db.DB

-    bsddb._db.DBSequence_orig = bsddb._db.DBSequence

+    if bsddb.db.version() <= (4, 3) :

+        bsddb._db.DBSequence_orig = None

+    else :

+        bsddb._db.DBSequence_orig = bsddb._db.DBSequence

     def do_proxy_db_py3k(flag) :

         flag2 = do_proxy_db_py3k.flag

@@ -481,6 +513,7 @@ def suite(module_prefix='', timing_check

     test_modules = [

         'test_associate',

         'test_basics',

+        'test_dbenv',

         'test_compare',

         'test_compat',

         'test_cursor_pget_bug',

@@ -489,6 +522,7 @@ def suite(module_prefix='', timing_check

         'test_dbtables',

         'test_distributed_transactions',

         'test_early_close',

+        'test_fileid',

         'test_get_none',

         'test_join',

         'test_lock',

diff -Nupr Python-2.6.4.orig/Lib/bsddb/test/test_associate.py Python-2.6.4/Lib/bsddb/test/test_associate.py

--- Python-2.6.4.orig/Lib/bsddb/test/test_associate.py	2008-08-31 10:00:51.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/test/test_associate.py	2009-12-04 07:36:00.000000000 -0500

@@ -148,12 +148,8 @@ class AssociateTestCase(unittest.TestCas

         self.secDB = None

         self.primary = db.DB(self.env)

         self.primary.set_get_returns_none(2)

-        if db.version() >= (4, 1):

-            self.primary.open(self.filename, "primary", self.dbtype,

-                          db.DB_CREATE | db.DB_THREAD | self.dbFlags, txn=txn)

-        else:

-            self.primary.open(self.filename, "primary", self.dbtype,

-                          db.DB_CREATE | db.DB_THREAD | self.dbFlags)

+        self.primary.open(self.filename, "primary", self.dbtype,

+                      db.DB_CREATE | db.DB_THREAD | self.dbFlags, txn=txn)

     def closeDB(self):

         if self.cur:

@@ -169,12 +165,7 @@ class AssociateTestCase(unittest.TestCas

         return self.primary

-    def test01_associateWithDB(self):

-        if verbose:

-            print '\n', '-=' * 30

-            print "Running %s.test01_associateWithDB..." % \

-                  self.__class__.__name__

-

+    def _associateWithDB(self, getGenre):

         self.createDB()

         self.secDB = db.DB(self.env)

@@ -182,19 +173,21 @@ class AssociateTestCase(unittest.TestCas

         self.secDB.set_get_returns_none(2)

         self.secDB.open(self.filename, "secondary", db.DB_BTREE,

                    db.DB_CREATE | db.DB_THREAD | self.dbFlags)

-        self.getDB().associate(self.secDB, self.getGenre)

+        self.getDB().associate(self.secDB, getGenre)

         self.addDataToDB(self.getDB())

         self.finish_test(self.secDB)

-

-    def test02_associateAfterDB(self):

+    def test01_associateWithDB(self):

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test02_associateAfterDB..." % \

+            print "Running %s.test01_associateWithDB..." % \

                   self.__class__.__name__

+        return self._associateWithDB(self.getGenre)

+

+    def _associateAfterDB(self, getGenre) :

         self.createDB()

         self.addDataToDB(self.getDB())

@@ -204,10 +197,35 @@ class AssociateTestCase(unittest.TestCas

                    db.DB_CREATE | db.DB_THREAD | self.dbFlags)

         # adding the DB_CREATE flag will cause it to index existing records

-        self.getDB().associate(self.secDB, self.getGenre, db.DB_CREATE)

+        self.getDB().associate(self.secDB, getGenre, db.DB_CREATE)

         self.finish_test(self.secDB)

+    def test02_associateAfterDB(self):

+        if verbose:

+            print '\n', '-=' * 30

+            print "Running %s.test02_associateAfterDB..." % \

+                  self.__class__.__name__

+

+        return self._associateAfterDB(self.getGenre)

+

+    if db.version() >= (4, 6):

+        def test03_associateWithDB(self):

+            if verbose:

+                print '\n', '-=' * 30

+                print "Running %s.test03_associateWithDB..." % \

+                      self.__class__.__name__

+

+            return self._associateWithDB(self.getGenreList)

+

+        def test04_associateAfterDB(self):

+            if verbose:

+                print '\n', '-=' * 30

+                print "Running %s.test04_associateAfterDB..." % \

+                      self.__class__.__name__

+

+            return self._associateAfterDB(self.getGenreList)

+

     def finish_test(self, secDB, txn=None):

         # 'Blues' should not be in the secondary database

@@ -277,6 +295,12 @@ class AssociateTestCase(unittest.TestCas

         else:

             return genre

+    def getGenreList(self, priKey, PriData) :

+        v = self.getGenre(priKey, PriData)

+        if type(v) == type("") :

+            v = [v]

+        return v

+

 #----------------------------------------------------------------------

@@ -322,10 +346,7 @@ class AssociateBTreeTxnTestCase(Associat

             self.secDB.set_get_returns_none(2)

             self.secDB.open(self.filename, "secondary", db.DB_BTREE,

                        db.DB_CREATE | db.DB_THREAD, txn=txn)

-            if db.version() >= (4,1):

-                self.getDB().associate(self.secDB, self.getGenre, txn=txn)

-            else:

-                self.getDB().associate(self.secDB, self.getGenre)

+            self.getDB().associate(self.secDB, self.getGenre, txn=txn)

             self.addDataToDB(self.getDB(), txn=txn)

         except:

@@ -426,8 +447,7 @@ def test_suite():

     suite.addTest(unittest.makeSuite(AssociateBTreeTestCase))

     suite.addTest(unittest.makeSuite(AssociateRecnoTestCase))

-    if db.version() >= (4, 1):

-        suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase))

+    suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase))

     suite.addTest(unittest.makeSuite(ShelveAssociateHashTestCase))

     suite.addTest(unittest.makeSuite(ShelveAssociateBTreeTestCase))

diff -Nupr Python-2.6.4.orig/Lib/bsddb/test/test_basics.py Python-2.6.4/Lib/bsddb/test/test_basics.py

--- Python-2.6.4.orig/Lib/bsddb/test/test_basics.py	2009-07-02 11:37:21.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/test/test_basics.py	2009-12-04 07:36:00.000000000 -0500

@@ -33,6 +33,7 @@ class VersionTestCase(unittest.TestCase)

 class BasicTestCase(unittest.TestCase):

     dbtype       = db.DB_UNKNOWN  # must be set in derived class

+    cachesize    = (0, 1024*1024, 1)

     dbopenflags  = 0

     dbsetflags   = 0

     dbmode       = 0660

@@ -43,6 +44,13 @@ class BasicTestCase(unittest.TestCase):

     _numKeys      = 1002    # PRIVATE.  NOTE: must be an even value

+    import sys

+    if sys.version_info[:3] < (2, 4, 0):

+        def assertTrue(self, expr, msg=None):

+            self.failUnless(expr,msg=msg)

+        def assertFalse(self, expr, msg=None):

+            self.failIf(expr,msg=msg)

+

     def setUp(self):

         if self.useEnv:

             self.homeDir=get_new_environment_path()

@@ -50,7 +58,8 @@ class BasicTestCase(unittest.TestCase):

                 self.env = db.DBEnv()

                 self.env.set_lg_max(1024*1024)

                 self.env.set_tx_max(30)

-                self.env.set_tx_timestamp(int(time.time()))

+                self._t = int(time.time())

+                self.env.set_tx_timestamp(self._t)

                 self.env.set_flags(self.envsetflags, 1)

                 self.env.open(self.homeDir, self.envflags | db.DB_CREATE)

                 self.filename = "test"

@@ -64,6 +73,15 @@ class BasicTestCase(unittest.TestCase):

         # create and open the DB

         self.d = db.DB(self.env)

+        if not self.useEnv :

+            if db.version() >= (4, 2) :

+                self.d.set_cachesize(*self.cachesize)

+                cachesize = self.d.get_cachesize()

+                self.assertEqual(cachesize[0], self.cachesize[0])

+                self.assertEqual(cachesize[2], self.cachesize[2])

+                # Berkeley DB expands the cache 25% accounting overhead,

+                # if the cache is small.

+                self.assertEqual(125, int(100.0*cachesize[1]/self.cachesize[1]))

         self.d.set_flags(self.dbsetflags)

         if self.dbname:

             self.d.open(self.filename, self.dbname, self.dbtype,

@@ -74,6 +92,10 @@ class BasicTestCase(unittest.TestCase):

                         dbtype = self.dbtype,

                         flags = self.dbopenflags|db.DB_CREATE)

+        if not self.useEnv:

+            self.assertRaises(db.DBInvalidArgError,

+                    self.d.set_cachesize, *self.cachesize)

+

         self.populateDB()

@@ -131,7 +153,7 @@ class BasicTestCase(unittest.TestCase):

         self.assertEqual(d.get('0321'), '0321-0321-0321-0321-0321')

-        # By default non-existent keys return None...

+        # By default non-existant keys return None...

         self.assertEqual(d.get('abcd'), None)

         # ...but they raise exceptions in other situations.  Call

@@ -276,6 +298,21 @@ class BasicTestCase(unittest.TestCase):

             pprint(values[:10])

+    #----------------------------------------

+

+    def test02b_SequenceMethods(self):

+        d = self.d

+

+        for key in ['0002', '0101', '0401', '0701', '0998']:

+            data = d[key]

+            self.assertEqual(data, self.makeData(key))

+            if verbose:

+                print data

+

+        self.assertTrue(hasattr(d, "__contains__"))

+        self.assertTrue("0401" in d)

+        self.assertFalse("1234" in d)

+

     #----------------------------------------

@@ -509,6 +546,15 @@ class BasicTestCase(unittest.TestCase):

         self.assertEqual(old, 1)

         self.test03_SimpleCursorStuff(get_raises_error=0, set_raises_error=0)

+    if db.version() >= (4, 6):

+        def test03d_SimpleCursorPriority(self) :

+            c = self.d.cursor()

+            c.set_priority(db.DB_PRIORITY_VERY_LOW)  # Positional

+            self.assertEqual(db.DB_PRIORITY_VERY_LOW, c.get_priority())

+            c.set_priority(priority=db.DB_PRIORITY_HIGH)  # Keyword

+            self.assertEqual(db.DB_PRIORITY_HIGH, c.get_priority())

+            c.close()

+

     #----------------------------------------

     def test04_PartialGetAndPut(self):

@@ -562,7 +608,7 @@ class BasicTestCase(unittest.TestCase):

         d = self.d

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test99_Truncate..." % self.__class__.__name__

+            print "Running %s.test06_Truncate..." % self.__class__.__name__

         d.put("abcde", "ABCDE");

         num = d.truncate()

@@ -582,6 +628,33 @@ class BasicTestCase(unittest.TestCase):

     #----------------------------------------

+    if db.version() >= (4, 6):

+        def test08_exists(self) :

+            self.d.put("abcde", "ABCDE")

+            self.assert_(self.d.exists("abcde") == True,

+                    "DB->exists() returns wrong value")

+            self.assert_(self.d.exists("x") == False,

+                    "DB->exists() returns wrong value")

+

+    #----------------------------------------

+

+    if db.version() >= (4, 7):

+        def test_compact(self) :

+            d = self.d

+            self.assertEqual(0, d.compact(flags=db.DB_FREELIST_ONLY))

+            self.assertEqual(0, d.compact(flags=db.DB_FREELIST_ONLY))

+            d.put("abcde", "ABCDE");

+            d.put("bcde", "BCDE");

+            d.put("abc", "ABC");

+            d.put("monty", "python");

+            d.delete("abc")

+            d.delete("bcde")

+            d.compact(start='abcde', stop='monty', txn=None,

+                    compact_fillpercent=42, compact_pages=1,

+                    compact_timeout=50000000,

+                    flags=db.DB_FREELIST_ONLY|db.DB_FREE_SPACE)

+

+    #----------------------------------------

 #----------------------------------------------------------------------

@@ -611,13 +684,13 @@ class BasicWithEnvTestCase(BasicTestCase

     #----------------------------------------

-    def test08_EnvRemoveAndRename(self):

+    def test09_EnvRemoveAndRename(self):

         if not self.env:

             return

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test08_EnvRemoveAndRename..." % self.__class__.__name__

+            print "Running %s.test09_EnvRemoveAndRename..." % self.__class__.__name__

         # can't rename or remove an open DB

         self.d.close()

@@ -626,10 +699,6 @@ class BasicWithEnvTestCase(BasicTestCase

         self.env.dbrename(self.filename, None, newname)

         self.env.dbremove(newname)

-    # dbremove and dbrename are in 4.1 and later

-    if db.version() < (4,1):

-        del test08_EnvRemoveAndRename

-

     #----------------------------------------

 class BasicBTreeWithEnvTestCase(BasicWithEnvTestCase):

@@ -729,11 +798,25 @@ class BasicTransactionTestCase(BasicTest

     #----------------------------------------

-    def test08_TxnTruncate(self):

+    if db.version() >= (4, 6):

+        def test08_exists(self) :

+            txn = self.env.txn_begin()

+            self.d.put("abcde", "ABCDE", txn=txn)

+            txn.commit()

+            txn = self.env.txn_begin()

+            self.assert_(self.d.exists("abcde", txn=txn) == True,

+                    "DB->exists() returns wrong value")

+            self.assert_(self.d.exists("x", txn=txn) == False,

+                    "DB->exists() returns wrong value")

+            txn.abort()

+

+    #----------------------------------------

+

+    def test09_TxnTruncate(self):

         d = self.d

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test08_TxnTruncate..." % self.__class__.__name__

+            print "Running %s.test09_TxnTruncate..." % self.__class__.__name__

         d.put("abcde", "ABCDE");

         txn = self.env.txn_begin()

@@ -746,7 +829,7 @@ class BasicTransactionTestCase(BasicTest

     #----------------------------------------

-    def test09_TxnLateUse(self):

+    def test10_TxnLateUse(self):

         txn = self.env.txn_begin()

         txn.abort()

         try:

@@ -766,6 +849,39 @@ class BasicTransactionTestCase(BasicTest

             raise RuntimeError, "DBTxn.commit() called after DB_TXN no longer valid w/o an exception"

+    #----------------------------------------

+

+

+    if db.version() >= (4, 4):

+        def test_txn_name(self) :

+            txn=self.env.txn_begin()

+            self.assertEqual(txn.get_name(), "")

+            txn.set_name("XXYY")

+            self.assertEqual(txn.get_name(), "XXYY")

+            txn.set_name("")

+            self.assertEqual(txn.get_name(), "")

+            txn.abort()

+

+    #----------------------------------------

+

+

+        def test_txn_set_timeout(self) :

+            txn=self.env.txn_begin()

+            txn.set_timeout(1234567, db.DB_SET_LOCK_TIMEOUT)

+            txn.set_timeout(2345678, flags=db.DB_SET_TXN_TIMEOUT)

+            txn.abort()

+

+    #----------------------------------------

+

+    if db.version() >= (4, 2) :

+        def test_get_tx_max(self) :

+            self.assertEqual(self.env.get_tx_max(), 30)

+

+        def test_get_tx_timestamp(self) :

+            self.assertEqual(self.env.get_tx_timestamp(), self._t)

+

+

+

 class BTreeTransactionTestCase(BasicTransactionTestCase):

     dbtype = db.DB_BTREE

@@ -780,11 +896,11 @@ class BTreeRecnoTestCase(BasicTestCase):

     dbtype     = db.DB_BTREE

     dbsetflags = db.DB_RECNUM

-    def test08_RecnoInBTree(self):

+    def test09_RecnoInBTree(self):

         d = self.d

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test08_RecnoInBTree..." % self.__class__.__name__

+            print "Running %s.test09_RecnoInBTree..." % self.__class__.__name__

         rec = d.get(200)

         self.assertEqual(type(rec), type(()))

@@ -814,11 +930,11 @@ class BTreeRecnoWithThreadFlagTestCase(B

 class BasicDUPTestCase(BasicTestCase):

     dbsetflags = db.DB_DUP

-    def test09_DuplicateKeys(self):

+    def test10_DuplicateKeys(self):

         d = self.d

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test09_DuplicateKeys..." % \

+            print "Running %s.test10_DuplicateKeys..." % \

                   self.__class__.__name__

         d.put("dup0", "before")

@@ -887,11 +1003,11 @@ class BasicMultiDBTestCase(BasicTestCase

         else:

             return db.DB_BTREE

-    def test10_MultiDB(self):

+    def test11_MultiDB(self):

         d1 = self.d

         if verbose:

             print '\n', '-=' * 30

-            print "Running %s.test10_MultiDB..." % self.__class__.__name__

+            print "Running %s.test11_MultiDB..." % self.__class__.__name__

         d2 = db.DB(self.env)

         d2.open(self.filename, "second", self.dbtype,

@@ -1032,11 +1148,12 @@ class CrashAndBurn(unittest.TestCase) :

     #    # See http://bugs.python.org/issue3307

     #    self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)

-    def test02_DBEnv_dealloc(self):

-        # http://bugs.python.org/issue3885

-        import gc

-        self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)

-        gc.collect()

+    if db.version() < (4, 8) :

+        def test02_DBEnv_dealloc(self):

+            # http://bugs.python.org/issue3885

+            import gc

+            self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)

+            gc.collect()

 #----------------------------------------------------------------------

diff -Nupr Python-2.6.4.orig/Lib/bsddb/test/test_compare.py Python-2.6.4/Lib/bsddb/test/test_compare.py

--- Python-2.6.4.orig/Lib/bsddb/test/test_compare.py	2008-08-31 10:00:51.000000000 -0400

+++ Python-2.6.4/Lib/bsddb/test/test_compare.py	2009-12-04 07:36:00.000000000 -0500

@@ -12,6 +12,12 @@ from test_all import db, dbshelve, test_

         get_new_environment_path, get_new_database_path

+# Needed for python 3. "cmp" vanished in 3.0.1

+def cmp(a, b) :

+    if a==b : return 0

+    if a

+    return 1

+

 lexical_cmp = cmp

 def lowercase_cmp(left, right):

@@ -26,6 +32,10 @@ _expected_lexical_test_data = ['', 'CCCP

 _expected_lowercase_test_data = ['', 'a', 'aaa', 'b', 'c', 'CC', 'cccce', 'ccccf', 'CCCP']

 class ComparatorTests (unittest.TestCase):

+    if sys.version_info[:3] < (2, 4, 0):

+        def assertTrue(self, expr, msg=None):

+            self.failUnless(expr,msg=msg)

+

     def comparator_test_helper (self, comparator, expected_data):

         data = expected_data[:]

@@ -47,7 +57,7 @@ class ComparatorTests (unittest.TestCase

                     data2.append(i)

             data = data2

-        self.failUnless (data == expected_data,

+        self.assertTrue (data == expected_data,

                          "comparator `%s' is not right: %s vs. %s"

                          % (comparator, expected_data, data))

     def test_lexical_comparator (self):

@@ -65,6 +75,10 @@ class AbstractBtreeKeyCompareTestCase (u

     env = None

     db = None

+    if sys.version_info[:3] < (2, 4, 0):

+        def assertTrue(self, expr, msg=None):

+            self.failUnless(expr,msg=msg)

+

     def setUp (self):

         self.filename = self.__class__.__name__ + '.db'

         self.homeDir = get_new_environment_path()

@@ -115,14 +129,14 @@ class AbstractBtreeKeyCompareTestCase (u

             rec = curs.first ()

             while rec:

                 key, ignore = rec

-                self.failUnless (index < len (expected),

+                self.assertTrue(index < len (expected),

                                  "to many values returned from cursor")

-                self.failUnless (expected[index] == key,

+                self.assertTrue(expected[index] == key,

                                  "expected value `%s' at %d but got `%s'"

                                  % (expected[index], index, key))

                 index = index + 1