Everything worked in both the distutils distro and in Python 2.3cvs,
so merge from the bsddb-bsddb3-schizo-branch back to the trunk.
diff --git a/Lib/bsddb/dbutils.py b/Lib/bsddb/dbutils.py
index 7328ca7..3568b44 100644
--- a/Lib/bsddb/dbutils.py
+++ b/Lib/bsddb/dbutils.py
@@ -26,7 +26,12 @@
#
from time import sleep as _sleep
-from bsddb import _db
+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
_deadlock_MinSleepTime = 1.0/64
@@ -60,7 +65,7 @@
while 1:
try:
return function(*_args, **_kwargs)
- except _db.DBLockDeadlockError:
+ except db.DBLockDeadlockError:
if _deadlock_VerboseFile:
_deadlock_VerboseFile.write(
'dbutils.DeadlockWrap: sleeping %1.3f\n' % sleeptime)