Update of /cvsroot/python/python/dist/src/Lib/bsddb In directory sc8-pr-cvs1:/tmp/cvs-serv7039 Modified Files: Tag: release23-maint __init__.py db.py dbshelve.py dbutils.py Log Message: simplify some import statements and clean up a docstring and BerkeleyDB library version check to mention that we support versions 3.2 - 4.2. Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/__init__.py,v retrieving revision 1.5.10.2 retrieving revision 1.5.10.3 diff -C2 -d -r1.5.10.2 -r1.5.10.3 *** __init__.py 21 Sep 2003 04:51:46 -0000 1.5.10.2 --- __init__.py 21 Sep 2003 23:18:29 -0000 1.5.10.3 *************** *** 34,38 **** ! """Support for BerkeleyDB 3.1 through 4.1. """ --- 34,38 ---- ! """Support for BerkeleyDB 3.2 through 4.2. """ Index: db.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/db.py,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -C2 -d -r1.2 -r1.2.16.1 *** db.py 19 Nov 2002 17:48:48 -0000 1.2 --- db.py 21 Sep 2003 23:18:29 -0000 1.2.16.1 *************** *** 41,44 **** from _bsddb import __version__ ! if version() < (3, 1, 0): ! raise ImportError, "BerkeleyDB 3.x symbols not found. Perhaps python was statically linked with an older version?" --- 41,44 ---- from _bsddb import __version__ ! if version() < (3, 2, 0): ! raise ImportError, "correct BerkeleyDB symbols not found. Perhaps python was statically linked with an older version?" Index: dbshelve.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbshelve.py,v retrieving revision 1.8 retrieving revision 1.8.10.1 diff -C2 -d -r1.8 -r1.8.10.1 *** dbshelve.py 24 Apr 2003 16:02:46 -0000 1.8 --- dbshelve.py 21 Sep 2003 23:18:29 -0000 1.8.10.1 *************** *** 36,45 **** # DictMixin is new in Python 2.3 class DictMixin: pass ! try: ! # For Python 2.3 ! from bsddb import db ! except ImportError: ! # For earlier Pythons w/distutils pybsddb ! from bsddb3 import db #------------------------------------------------------------------------ --- 36,40 ---- # DictMixin is new in Python 2.3 class DictMixin: pass ! import db #------------------------------------------------------------------------ Index: dbutils.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/dbutils.py,v retrieving revision 1.6 retrieving revision 1.6.12.1 diff -C2 -d -r1.6 -r1.6.12.1 *** dbutils.py 28 Jan 2003 17:20:42 -0000 1.6 --- dbutils.py 21 Sep 2003 23:18:29 -0000 1.6.12.1 *************** *** 27,36 **** from time import sleep as _sleep ! 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 --- 27,31 ---- from time import sleep as _sleep ! import db # always sleep at least N seconds between retrys