[Python-checkins] r53254 - in python/branches/release25-maint: Doc/lib/libbsddb.tex Lib/bsddb/dbobj.py Lib/bsddb/test/test_1413192.py Misc/NEWS Modules/_bsddb.c setup.py
gregory.p.smith
python-checkins at python.org
Fri Jan 5 03:09:08 CET 2007
Author: gregory.p.smith
Date: Fri Jan 5 03:09:06 2007
New Revision: 53254
Modified:
python/branches/release25-maint/Doc/lib/libbsddb.tex
python/branches/release25-maint/Lib/bsddb/dbobj.py
python/branches/release25-maint/Lib/bsddb/test/test_1413192.py
python/branches/release25-maint/Misc/NEWS
python/branches/release25-maint/Modules/_bsddb.c
python/branches/release25-maint/setup.py
Log:
support linking the _bsddb extension module against BerkeleyDB 4.5
[backport of r53252]
Modified: python/branches/release25-maint/Doc/lib/libbsddb.tex
==============================================================================
--- python/branches/release25-maint/Doc/lib/libbsddb.tex (original)
+++ python/branches/release25-maint/Doc/lib/libbsddb.tex Fri Jan 5 03:09:06 2007
@@ -16,7 +16,7 @@
\function{pickle.dumps()}.
The \module{bsddb} module requires a Berkeley DB library version from
-3.3 thru 4.4.
+3.3 thru 4.5.
\begin{seealso}
\seeurl{http://pybsddb.sourceforge.net/}
Modified: python/branches/release25-maint/Lib/bsddb/dbobj.py
==============================================================================
--- python/branches/release25-maint/Lib/bsddb/dbobj.py (original)
+++ python/branches/release25-maint/Lib/bsddb/dbobj.py Fri Jan 5 03:09:06 2007
@@ -55,8 +55,9 @@
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):
Modified: python/branches/release25-maint/Lib/bsddb/test/test_1413192.py
==============================================================================
--- python/branches/release25-maint/Lib/bsddb/test/test_1413192.py (original)
+++ python/branches/release25-maint/Lib/bsddb/test/test_1413192.py Fri Jan 5 03:09:06 2007
@@ -14,7 +14,7 @@
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)
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS (original)
+++ python/branches/release25-maint/Misc/NEWS Fri Jan 5 03:09:06 2007
@@ -124,6 +124,8 @@
- Make regex engine raise MemoryError if allocating memory fails.
+- Added support for linking the bsddb module against BerkeleyDB 4.5.x.
+
Library
-------
Modified: python/branches/release25-maint/Modules/_bsddb.c
==============================================================================
--- python/branches/release25-maint/Modules/_bsddb.c (original)
+++ python/branches/release25-maint/Modules/_bsddb.c Fri Jan 5 03:09:06 2007
@@ -98,7 +98,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
-#define PY_BSDDB_VERSION "4.4.5.1"
+#define PY_BSDDB_VERSION "4.4.5.2"
static char *rcs_id = "$Id$";
@@ -4127,6 +4127,7 @@
}
+#if (DBVER < 45)
static PyObject*
DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
{
@@ -4142,6 +4143,7 @@
RETURN_IF_ERR();
RETURN_NONE();
}
+#endif
#if (DBVER >= 32)
@@ -5231,7 +5233,9 @@
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
#endif
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
+#if (DBVER < 45)
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
+#endif
#if (DBVER >= 32)
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
@@ -5833,7 +5837,9 @@
ADD_INT(d, DB_AFTER);
ADD_INT(d, DB_APPEND);
ADD_INT(d, DB_BEFORE);
+#if (DBVER < 45)
ADD_INT(d, DB_CACHED_COUNTS);
+#endif
#if (DBVER >= 41)
_addIntToDict(d, "DB_CHECKPOINT", 0);
#else
@@ -5868,7 +5874,9 @@
ADD_INT(d, DB_POSITION);
ADD_INT(d, DB_PREV);
ADD_INT(d, DB_PREV_NODUP);
+#if (DBVER < 45)
ADD_INT(d, DB_RECORDCOUNT);
+#endif
ADD_INT(d, DB_SET);
ADD_INT(d, DB_SET_RANGE);
ADD_INT(d, DB_SET_RECNO);
Modified: python/branches/release25-maint/setup.py
==============================================================================
--- python/branches/release25-maint/setup.py (original)
+++ python/branches/release25-maint/setup.py Fri Jan 5 03:09:06 2007
@@ -606,7 +606,7 @@
# a release. Most open source OSes come with one or more
# versions of BerkeleyDB already installed.
- max_db_ver = (4, 4)
+ max_db_ver = (4, 5)
min_db_ver = (3, 3)
db_setup_debug = False # verbose debug prints from this script?
@@ -623,7 +623,7 @@
'/sw/include/db3',
]
# 4.x minor number specific paths
- for x in (0,1,2,3,4):
+ for x in (0,1,2,3,4,5):
db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
@@ -631,7 +631,7 @@
db_inc_paths.append('/pkg/db-4.%d/include' % x)
db_inc_paths.append('/opt/db-4.%d/include' % x)
# 3.x minor number specific paths
- for x in (2,3):
+ for x in (3,):
db_inc_paths.append('/usr/include/db3%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
db_inc_paths.append('/usr/local/include/db3%d' % x)
More information about the Python-checkins
mailing list