[Python-checkins] python/dist/src/Lib/bsddb/test test_all.py, 1.2,
1.3 test_associate.py, 1.5, 1.6 test_basics.py, 1.7,
1.8 test_compat.py, 1.5, 1.6 test_dbobj.py, 1.4,
1.5 test_dbshelve.py, 1.5, 1.6 test_dbtables.py, 1.5,
1.6 test_env_close.py, 1.5, 1.6 test_get_none.py, 1.4,
1.5 test_join.py, 1.6, 1.7 test_lock.py, 1.4, 1.5 test_misc.py,
1.4, 1.5 test_queue.py, 1.3, 1.4 test_recno.py, 1.6,
1.7 test_thread.py, 1.7, 1.8
greg at users.sourceforge.net
greg at users.sourceforge.net
Sat Sep 20 20:08:17 EDT 2003
Update of /cvsroot/python/python/dist/src/Lib/bsddb/test
In directory sc8-pr-cvs1:/tmp/cvs-serv14110/bsddb/test
Modified Files:
test_all.py test_associate.py test_basics.py test_compat.py
test_dbobj.py test_dbshelve.py test_dbtables.py
test_env_close.py test_get_none.py test_join.py test_lock.py
test_misc.py test_queue.py test_recno.py test_thread.py
Log Message:
Adds basic support for BerkeleyDB 4.2.x. Compiles and passes tests; new
features in BerkeleyDB not exposed. notably: the DB_MPOOLFILE interface
has not yet been wrapped in an object.
Adds support for building and installing bsddb3 in python2.3 that has
an older version of this module installed as bsddb without conflicts.
The pybsddb.sf.net build/packaged version of the module uses a
dynamicly loadable module called _pybsddb rather than _bsddb.
Index: test_all.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_all.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_all.py 28 Jan 2003 17:20:42 -0000 1.2
--- test_all.py 21 Sep 2003 00:08:14 -0000 1.3
***************
*** 18,26 ****
def print_versions():
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
print
print '-=' * 38
--- 18,26 ----
def print_versions():
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
print
print '-=' * 38
Index: test_associate.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_associate.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_associate.py 9 Jul 2003 04:45:59 -0000 1.5
--- test_associate.py 21 Sep 2003 00:08:14 -0000 1.6
***************
*** 18,26 ****
try:
# For Python 2.3
from bsddb import db, dbshelve
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbshelve
--- 18,26 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbshelve
+ except ImportError:
# For Python 2.3
from bsddb import db, dbshelve
Index: test_basics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_basics.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_basics.py 9 Jul 2003 04:45:59 -0000 1.7
--- test_basics.py 21 Sep 2003 00:08:14 -0000 1.8
***************
*** 14,22 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
from test_all import verbose
--- 14,22 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
from test_all import verbose
Index: test_compat.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_compat.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_compat.py 9 Jul 2003 05:29:24 -0000 1.5
--- test_compat.py 21 Sep 2003 00:08:14 -0000 1.6
***************
*** 11,19 ****
try:
# For Python 2.3
from bsddb import db, hashopen, btopen, rnopen
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, hashopen, btopen, rnopen
--- 11,19 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, hashopen, btopen, rnopen
+ except ImportError:
# For Python 2.3
from bsddb import db, hashopen, btopen, rnopen
Index: test_dbobj.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbobj.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_dbobj.py 28 Jan 2003 17:20:44 -0000 1.4
--- test_dbobj.py 21 Sep 2003 00:08:14 -0000 1.5
***************
*** 5,13 ****
try:
# For Python 2.3
from bsddb import db, dbobj
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbobj
--- 5,13 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbobj
+ except ImportError:
# For Python 2.3
from bsddb import db, dbobj
Index: test_dbshelve.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbshelve.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_dbshelve.py 28 Jan 2003 17:20:44 -0000 1.5
--- test_dbshelve.py 21 Sep 2003 00:08:14 -0000 1.6
***************
*** 10,18 ****
try:
# For Python 2.3
from bsddb import db, dbshelve
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbshelve
from test_all import verbose
--- 10,18 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbshelve
+ except ImportError:
# For Python 2.3
from bsddb import db, dbshelve
from test_all import verbose
Index: test_dbtables.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbtables.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_dbtables.py 28 Jan 2003 17:20:44 -0000 1.5
--- test_dbtables.py 21 Sep 2003 00:08:14 -0000 1.6
***************
*** 32,40 ****
try:
# For Python 2.3
from bsddb import db, dbtables
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbtables
--- 32,40 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbtables
+ except ImportError:
# For Python 2.3
from bsddb import db, dbtables
Index: test_env_close.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_env_close.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_env_close.py 28 Jan 2003 17:20:44 -0000 1.5
--- test_env_close.py 21 Sep 2003 00:08:14 -0000 1.6
***************
*** 10,18 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
from test_all import verbose
--- 10,18 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
from test_all import verbose
Index: test_get_none.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_get_none.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_get_none.py 28 Jan 2003 17:20:44 -0000 1.4
--- test_get_none.py 21 Sep 2003 00:08:14 -0000 1.5
***************
*** 9,17 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
from test_all import verbose
--- 9,17 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
from test_all import verbose
Index: test_join.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_join.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_join.py 21 Jul 2003 18:43:33 -0000 1.6
--- test_join.py 21 Sep 2003 00:08:14 -0000 1.7
***************
*** 17,25 ****
try:
# For Python 2.3
from bsddb import db, dbshelve
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbshelve
--- 17,25 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbshelve
+ except ImportError:
# For Python 2.3
from bsddb import db, dbshelve
Index: test_lock.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_lock.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_lock.py 27 Mar 2003 17:23:29 -0000 1.4
--- test_lock.py 21 Sep 2003 00:08:14 -0000 1.5
***************
*** 20,28 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
--- 20,28 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
Index: test_misc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_misc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_misc.py 3 Feb 2003 04:19:40 -0000 1.4
--- test_misc.py 21 Sep 2003 00:08:14 -0000 1.5
***************
*** 7,15 ****
try:
# For Python 2.3
from bsddb import db, dbshelve
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbshelve
#----------------------------------------------------------------------
--- 7,15 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbshelve
+ except ImportError:
# For Python 2.3
from bsddb import db, dbshelve
#----------------------------------------------------------------------
Index: test_queue.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_queue.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_queue.py 28 Jan 2003 17:20:44 -0000 1.3
--- test_queue.py 21 Sep 2003 00:08:14 -0000 1.4
***************
*** 9,17 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
from test_all import verbose
--- 9,17 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
from test_all import verbose
Index: test_recno.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_recno.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_recno.py 28 Jan 2003 17:20:44 -0000 1.6
--- test_recno.py 21 Sep 2003 00:08:14 -0000 1.7
***************
*** 12,20 ****
try:
# For Python 2.3
from bsddb import db
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
--- 12,20 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db
+ except ImportError:
# For Python 2.3
from bsddb import db
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
Index: test_thread.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_thread.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_thread.py 21 Jul 2003 23:01:34 -0000 1.7
--- test_thread.py 21 Sep 2003 00:08:14 -0000 1.8
***************
*** 29,37 ****
try:
# For Python 2.3
from bsddb import db, dbutils
- except ImportError:
- # For earlier Pythons w/distutils pybsddb
- from bsddb3 import db, dbutils
--- 29,37 ----
try:
+ # For Pythons w/distutils pybsddb
+ from bsddb3 import db, dbutils
+ except ImportError:
# For Python 2.3
from bsddb import db, dbutils
More information about the Python-checkins
mailing list