diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2007-01-05 01:59:42 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2007-01-05 01:59:42 (GMT) |
| commit | 8b96a35d14c0ec5db5f32321e544269a5b0a8759 (patch) | |
| tree | e34f90949bb24daab02c775616f5e96875f1da5a /Lib | |
| parent | 7b7c9d420817e5ffb5fd3adbc19a9be4ba0f4604 (diff) | |
| download | cpython-8b96a35d14c0ec5db5f32321e544269a5b0a8759.zip cpython-8b96a35d14c0ec5db5f32321e544269a5b0a8759.tar.gz cpython-8b96a35d14c0ec5db5f32321e544269a5b0a8759.tar.bz2 | |
Support linking of the bsddb module against BerkeleyDB 4.5.x
(will backport to 2.5)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/bsddb/dbobj.py | 5 | ||||
| -rw-r--r-- | Lib/bsddb/test/test_1413192.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py index 73a3010..b74ee72 100644 --- a/Lib/bsddb/dbobj.py +++ b/Lib/bsddb/dbobj.py @@ -55,8 +55,9 @@ class DBEnv: return apply(self._cobj.set_lg_max, args, kwargs) def set_lk_detect(self, *args, **kwargs): return apply(self._cobj.set_lk_detect, args, kwargs) - def set_lk_max(self, *args, **kwargs): - return apply(self._cobj.set_lk_max, args, kwargs) + if db.version() < (4,5): + def set_lk_max(self, *args, **kwargs): + return apply(self._cobj.set_lk_max, args, kwargs) def set_lk_max_locks(self, *args, **kwargs): return apply(self._cobj.set_lk_max_locks, args, kwargs) def set_lk_max_lockers(self, *args, **kwargs): diff --git a/Lib/bsddb/test/test_1413192.py b/Lib/bsddb/test/test_1413192.py index 3c13536..436f407 100644 --- a/Lib/bsddb/test/test_1413192.py +++ b/Lib/bsddb/test/test_1413192.py @@ -14,7 +14,7 @@ except ImportError: env_name = '.' env = db.DBEnv() -env.open(env_name, db.DB_CREATE | db.DB_INIT_TXN) +env.open(env_name, db.DB_CREATE | db.DB_INIT_TXN | db.DB_INIT_MPOOL) the_txn = env.txn_begin() map = db.DB(env) |