[Python-checkins] python/dist/src/Lib/bsddb dbutils.py,1.5,1.5.4.1

[bwarsaw@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/bsddb
In directory sc8-pr-cvs1:/tmp/cvs-serv32139

Modified Files:
      Tag: bsddb-bsddb3-schizo-branch
	dbutils.py 
Log Message:
Add compatibility idiom, which tries to get bsddb.db first, falling
back to bsddb3.db


Index: dbutils.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbutils.py,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** dbutils.py	30 Dec 2002 20:52:08 -0000	1.5
--- dbutils.py	28 Jan 2003 15:48:26 -0000	1.5.4.1
***************
*** 27,31 ****
  from time import sleep as _sleep
  
! from bsddb import _db
  
  # always sleep at least N seconds between retrys
--- 27,36 ----
  from time import sleep as _sleep
  
! try:
!     # For Python 2.3
!     from bsddb import db
! except ImportError:
!     # For earlier Pythons w/distutils pybsddb
!     from bsddb3 import db
  
  # always sleep at least N seconds between retrys
***************
*** 61,65 ****
          try:
              return function(*_args, **_kwargs)
!         except _db.DBLockDeadlockError:
              if _deadlock_VerboseFile:
                  _deadlock_VerboseFile.write(
--- 66,70 ----
          try:
              return function(*_args, **_kwargs)
!         except db.DBLockDeadlockError:
              if _deadlock_VerboseFile:
                  _deadlock_VerboseFile.write(