[Python-checkins] python/dist/src/Lib/bsddb/test test_all.py,1.1,1.2 test_associate.py,1.3,1.4 test_basics.py,1.5,1.6 test_compat.py,1.3,1.4 test_dbobj.py,1.3,1.4 test_dbshelve.py,1.4,1.5 test_dbtables.py,1.4,1.5 test_env_close.py,1.4,1.5 test_get_none.py,1.3,1.4 test_lock.py,1.2,1.3 test_misc.py,1.2,1.3 test_queue.py,1.2,1.3 test_recno.py,1.5,1.6 test_thread.py,1.4,1.5
bwarsaw@users.sourceforge.net
bwarsaw@users.sourceforge.net
Tue, 28 Jan 2003 09:20:54 -0800
- Previous message: [Python-checkins] python/dist/src/Lib/bsddb __init__.py,1.3,1.4 dbshelve.py,1.4,1.5 dbtables.py,1.6,1.7 dbutils.py,1.5,1.6
- Next message: [Python-checkins] python/dist/src/Modules _bsddb.c,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Lib/bsddb/test
In directory sc8-pr-cvs1:/tmp/cvs-serv17192/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_lock.py test_misc.py
test_queue.py test_recno.py test_thread.py
Log Message:
Everything worked in both the distutils distro and in Python 2.3cvs,
so merge from the bsddb-bsddb3-schizo-branch back to the trunk.
Index: test_all.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_all.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_all.py 30 Dec 2002 20:52:08 -0000 1.1
--- test_all.py 28 Jan 2003 17:20:42 -0000 1.2
***************
*** 17,21 ****
def print_versions():
! from bsddb import db
print
print '-=' * 38
--- 17,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
Index: test_associate.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_associate.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_associate.py 30 Dec 2002 20:52:08 -0000 1.3
--- test_associate.py 28 Jan 2003 17:20:43 -0000 1.4
***************
*** 17,21 ****
from test_all import verbose
! from bsddb import db, dbshelve
--- 17,26 ----
from test_all import verbose
! try:
! # For Python 2.3
! from bsddb import db, dbshelve
! except ImportError:
! # For earlier Pythons w/distutils pybsddb
! from bsddb3 import db, dbshelve
Index: test_basics.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_basics.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_basics.py 17 Jan 2003 08:42:50 -0000 1.5
--- test_basics.py 28 Jan 2003 17:20:43 -0000 1.6
***************
*** 13,17 ****
import unittest
! from bsddb import db
from test_all import verbose
--- 13,22 ----
import unittest
! 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
Index: test_compat.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_compat.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_compat.py 30 Dec 2002 20:52:08 -0000 1.3
--- test_compat.py 28 Jan 2003 17:20:43 -0000 1.4
***************
*** 5,9 ****
import sys, os, string
- from bsddb import hashopen, btopen, rnopen
import bsddb
import unittest
--- 5,8 ----
***************
*** 12,15 ****
--- 11,20 ----
from test_all import verbose
+ 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
***************
*** 127,131 ****
else:
if verbose: print "truth test: false"
! except bsddb.error:
pass
else:
--- 132,136 ----
else:
if verbose: print "truth test: false"
! except db.DBError:
pass
else:
Index: test_dbobj.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbobj.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_dbobj.py 30 Dec 2002 20:52:08 -0000 1.3
--- test_dbobj.py 28 Jan 2003 17:20:44 -0000 1.4
***************
*** 4,8 ****
import glob
! from bsddb import db, dbobj
--- 4,13 ----
import glob
! try:
! # For Python 2.3
! from bsddb import db, dbobj
! except ImportError:
! # For earlier Pythons w/distutils pybsddb
! from bsddb3 import db, dbobj
Index: test_dbshelve.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbshelve.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_dbshelve.py 30 Dec 2002 20:52:08 -0000 1.4
--- test_dbshelve.py 28 Jan 2003 17:20:44 -0000 1.5
***************
*** 9,13 ****
import unittest
! from bsddb import dbshelve, db
from test_all import verbose
--- 9,18 ----
import unittest
! 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
Index: test_dbtables.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbtables.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_dbtables.py 30 Dec 2002 20:52:08 -0000 1.4
--- test_dbtables.py 28 Jan 2003 17:20:44 -0000 1.5
***************
*** 31,35 ****
from test_all import verbose
! from bsddb import db, dbtables
--- 31,40 ----
from test_all import verbose
! try:
! # For Python 2.3
! from bsddb import db, dbtables
! except ImportError:
! # For earlier Pythons w/distutils pybsddb
! from bsddb3 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_env_close.py 31 Dec 2002 18:21:43 -0000 1.4
--- test_env_close.py 28 Jan 2003 17:20:44 -0000 1.5
***************
*** 9,13 ****
import unittest
! from bsddb import db
from test_all import verbose
--- 9,18 ----
import unittest
! 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
Index: test_get_none.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_get_none.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_get_none.py 30 Dec 2002 20:52:08 -0000 1.3
--- test_get_none.py 28 Jan 2003 17:20:44 -0000 1.4
***************
*** 8,12 ****
import unittest
! from bsddb import db
from test_all import verbose
--- 8,17 ----
import unittest
! 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
Index: test_lock.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_lock.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_lock.py 30 Dec 2002 20:52:08 -0000 1.2
--- test_lock.py 28 Jan 2003 17:20:44 -0000 1.3
***************
*** 19,23 ****
from test_all import verbose
! from bsddb import db
--- 19,28 ----
from test_all import verbose
! try:
! # For Python 2.3
! from bsddb import db
! except ImportError:
! # For earlier Pythons w/distutils pybsddb
! from bsddb3 import db
Index: test_misc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_misc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_misc.py 30 Dec 2002 20:52:08 -0000 1.2
--- test_misc.py 28 Jan 2003 17:20:44 -0000 1.3
***************
*** 6,11 ****
import unittest
! from bsddb import db
! from bsddb import dbshelve
from test.test_support import verbose
--- 6,15 ----
import unittest
! 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.test_support import verbose
Index: test_queue.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_queue.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_queue.py 30 Dec 2002 20:52:08 -0000 1.2
--- test_queue.py 28 Jan 2003 17:20:44 -0000 1.3
***************
*** 8,12 ****
import unittest
! from bsddb import db
from test_all import verbose
--- 8,17 ----
import unittest
! 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
Index: test_recno.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_recno.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_recno.py 10 Jan 2003 19:28:15 -0000 1.5
--- test_recno.py 28 Jan 2003 17:20:44 -0000 1.6
***************
*** 9,14 ****
import unittest
- from bsddb import db
from test_all import verbose
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
--- 9,20 ----
import unittest
from test_all import verbose
+
+ try:
+ # For Python 2.3
+ from bsddb import db
+ except ImportError:
+ # For earlier Pythons w/distutils pybsddb
+ from bsddb3 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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_thread.py 10 Jan 2003 19:03:29 -0000 1.4
--- test_thread.py 28 Jan 2003 17:20:44 -0000 1.5
***************
*** 27,31 ****
import unittest
from test_all import verbose
! from bsddb import db, dbutils
#----------------------------------------------------------------------
--- 27,38 ----
import unittest
from test_all import verbose
!
! try:
! # For Python 2.3
! from bsddb import db, dbutils
! except ImportError:
! # For earlier Pythons w/distutils pybsddb
! from bsddb3 import db, dbutils
!
#----------------------------------------------------------------------
- Previous message: [Python-checkins] python/dist/src/Lib/bsddb __init__.py,1.3,1.4 dbshelve.py,1.4,1.5 dbtables.py,1.6,1.7 dbutils.py,1.5,1.6
- Next message: [Python-checkins] python/dist/src/Modules _bsddb.c,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]